Merge branch 'master' into scenario-outline-with-slashes

Author: youtux

CHANGES.rst

@@ -3,6 +3,7 @@ Changelog
 
 Unreleased
 ----------
+- Drop compatibility with pytest < 7.0.0.
 
 8.0.0b1
 ----------

poetry.lock

@@ -39,7 +39,7 @@ python = ">=3.8"
 Mako = "*"
 parse = "*"
 parse-type = "*"
-pytest = ">=6.2.0"
+pytest = ">=7.0.0"
 typing-extensions = "*"
 packaging = "*"
 gherkin-official = "^29.0.0"

pyproject.toml

@@ -71,7 +71,7 @@ def collect_dumped_objects(result: RunResult) -> list:
     Note: You must run the result with output to stdout enabled.
     For example, using ``pytester.runpytest("-s")``.
     """
-    stdout = result.stdout.str()  # pytest < 6.2, otherwise we could just do str(result.stdout)
+    stdout = str(result.stdout)
     payloads = re.findall(rf"{_DUMP_START}(.*?){_DUMP_END}", stdout)
     return [pickle.loads(base64.b64decode(payload)) for payload in payloads]
 

src/pytest_bdd/utils.py

@@ -622,6 +622,51 @@ def _(stuff):
     )
 
 
+def test_lower_case_and(pytester):
+    pytester.makefile(
+        ".feature",
+        steps=textwrap.dedent(
+            """\
+            Feature: Step keywords need to be capitalised
+
+                Scenario: Step keywords must be capitalised
+                    Given that I'm writing an example
+                    and that I like the lowercase 'and'
+                    Then it should fail to parse
+            """
+        ),
+    )
+    pytester.makepyfile(
+        textwrap.dedent(
+            """\
+        import pytest
+        from pytest_bdd import given, when, then, scenarios
+
+        scenarios("steps.feature")
+
+
+        @given("that I'm writing an example")
+        def _():
+            pass
+
+
+        @given("that I like the lowercase 'and'")
+        def _():
+            pass
+
+
+        @then("it should fail to parse")
+        def _():
+            pass
+
+        """
+        )
+    )
+    result = pytester.runpytest()
+    result.assert_outcomes(errors=1)
+    result.stdout.fnmatch_lines("*TokenError*")
+
+
 def test_right_aligned_steps(pytester):
     """Parser correctly handles steps that are not left-aligned"""
     pytester.makefile(
@@ -653,3 +698,42 @@ def _():
     )
     result = pytester.runpytest()
     result.assert_outcomes(passed=1, failed=0)
+
+
+def test_keywords_used_outside_steps(pytester):
+    """Correctly identify when keyword is used for steps and when it's used for other cases."""
+    pytester.makefile(
+        ".feature",
+        keywords="""\
+        Feature: Given this is a Description
+
+            In order to achieve something
+            I want something
+            Because it will be cool
+            Given it is valid description
+            When it starts working
+            Then I will be happy
+
+
+            Some description goes here.
+
+            Scenario: When I set a Description
+                Given I have a bar
+                """,
+    )
+    pytester.makepyfile(
+        textwrap.dedent(
+            """\
+        from pytest_bdd import given, scenarios
+
+        scenarios("keywords.feature")
+
+        @given("I have a bar")
+        def _():
+            pass
+
+        """
+        )
+    )
+    result = pytester.runpytest()
+    result.assert_outcomes(passed=1, failed=0)

tests/feature/test_steps.py

@@ -137,7 +137,7 @@ def _(param):
     assert not result.stderr.str()
     assert result.ret == 0
 
-    output = result.stdout.str()
+    output = str(result.stdout)
 
     assert "I use the string parser" not in output
     assert "I use parsers.parse" not in output

tests/generation/test_generate_missing.py

@@ -100,7 +100,7 @@ def test_generate_with_quotes(pytester):
     )
 
     result = pytester.run("pytest-bdd", "generate", "generate_with_quotes.feature")
-    assert result.stdout.str() == textwrap.dedent(
+    assert str(result.stdout) == textwrap.dedent(
         '''\
     """Handling quotes in code generation feature tests."""
 
@@ -211,4 +211,4 @@ def _():
                 raise NotImplementedError
             '''
     )
-    assert result.stdout.str() == expected_output
+    assert str(result.stdout) == expected_output

tests/scripts/test_generate.py

@@ -1,6 +1,6 @@
 [tox]
 distshare = {homedir}/.tox/distshare
-envlist = py{3.8,3.9,3.10,3.11}-pytest{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2,8.3,latest}-coverage
+envlist = py{3.8,3.9,3.10,3.11}-pytest{7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2,8.3,latest}-coverage
           py{3.12,3.13}-pytest{7.3,7.4,8.0,8.1,8.2,8.3,latest}-coverage
           py3.12-pytestlatest-xdist-coverage
           mypy
@@ -19,7 +19,6 @@ deps =
     pytest7.2: pytest~=7.2.0
     pytest7.1: pytest~=7.1.0
     pytest7.0: pytest~=7.0.0
-    pytest6.2: pytest~=6.2.0
 
     coverage: coverage[toml]
     xdist: pytest-xdist