Merge pull request #415 from AntoineDao/generate-missing-parsers

Fix generate-missing for steps with parsers

Author: youtux

pytest_bdd/generation.py

@@ -116,14 +116,16 @@ def _find_step_fixturedef(fixturemanager, item, name, type_):
 
     :return: Step function.
     """
-    fixturedefs = fixturemanager.getfixturedefs(get_step_fixture_name(name, type_), item.nodeid)
-    if not fixturedefs:
-        name = find_argumented_step_fixture_name(name, type_, fixturemanager)
-        if name:
-            return _find_step_fixturedef(fixturemanager, item, name, type_)
-    else:
+    step_fixture_name = get_step_fixture_name(name, type_)
+    fixturedefs = fixturemanager.getfixturedefs(step_fixture_name, item.nodeid)
+    if fixturedefs is not None:
         return fixturedefs
 
+    argumented_step_name = find_argumented_step_fixture_name(name, type_, fixturemanager)
+    if argumented_step_name is not None:
+        return fixturemanager.getfixturedefs(argumented_step_name, item.nodeid)
+    return None
+
 
 def parse_feature_files(paths, **kwargs):
     """Parse feature files of given paths.

tests/generation/test_generate_missing.py

@@ -85,3 +85,61 @@ def test_missing_steps():
     )
 
     result.stdout.fnmatch_lines(["Please place the code above to the test file(s):"])
+
+
+def test_generate_missing_with_step_parsers(testdir):
+    """Test that step parsers are correctly discovered and won't be part of the missing steps."""
+    testdir.makefile(
+        ".feature",
+        generation=textwrap.dedent(
+            """\
+            Feature: Missing code generation with step parsers
+
+                Scenario: Step parsers are correctly discovered
+                    Given I use the string parser without parameter
+                    And I use parsers.parse with parameter 1
+                    And I use parsers.re with parameter 2
+                    And I use parsers.cfparse with parameter 3
+            """
+        ),
+    )
+
+    testdir.makepyfile(
+        textwrap.dedent(
+            """\
+        import functools
+
+        from pytest_bdd import scenarios, given, parsers
+
+        scenarios("generation.feature")
+
+        @given("I use the string parser without parameter")
+        def i_have_a_bar():
+            return None
+
+        @given(parsers.parse("I use parsers.parse with parameter {param}"))
+        def i_have_n_baz(param):
+            return param
+
+        @given(parsers.re(r"^I use parsers.re with parameter (?P<param>.*?)$"))
+        def i_have_n_baz(param):
+            return param
+
+        @given(parsers.cfparse("I use parsers.cfparse with parameter {param:d}"))
+        def i_have_n_baz(param):
+            return param
+        """
+        )
+    )
+
+    result = testdir.runpytest("--generate-missing", "--feature", "generation.feature")
+    assert_outcomes(result, passed=0, failed=0, errors=0)
+    assert not result.stderr.str()
+    assert result.ret == 0
+
+    output = result.stdout.str()
+
+    assert "I use the string parser" not in output
+    assert "I use parsers.parse" not in output
+    assert "I use parsers.re" not in output
+    assert "I use parsers.cfparse" not in output