Merge pull request #534 from pytest-dev/reusable-step-functions

Reusable step functions

CHANGES.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+Unreleased
+----------
+- Fix bug where steps without parsers would take precedence over steps with parsers. `#534 <https://github.com/pytest-dev/pytest-bdd/pull/534>`_
+- Step functions can now be decorated multiple times with @given, @when, @then. Previously every decorator would override ``converters`` and ``target_fixture`` every at every application. `#534 <https://github.com/pytest-dev/pytest-bdd/pull/534>`_ `#525 <https://github.com/pytest-dev/pytest-bdd/issues/525>`_
+
 6.0.1
 -----
 - Fix regression introduced in 6.0.0 where a step function decorated multiple using a parsers times would not be executed correctly. `#530 <https://github.com/pytest-dev/pytest-bdd/pull/530>`_ `#528 <https://github.com/pytest-dev/pytest-bdd/issues/528>`_

README.rst

@@ -208,12 +208,11 @@ for `cfparse` parser
     from pytest_bdd import parsers
 
     @given(
-        parsers.cfparse("there are {start:Number} cucumbers",
-        extra_types=dict(Number=int)),
+        parsers.cfparse("there are {start:Number} cucumbers", extra_types={"Number": int}),
         target_fixture="cucumbers",
     )
     def given_cucumbers(start):
-        return dict(start=start, eat=0)
+        return {"start": start, "eat": 0}
 
 for `re` parser
 
@@ -223,11 +222,11 @@ for `re` parser
 
     @given(
         parsers.re(r"there are (?P<start>\d+) cucumbers"),
-        converters=dict(start=int),
+        converters={"start": int},
         target_fixture="cucumbers",
     )
     def given_cucumbers(start):
-        return dict(start=start, eat=0)
+        return {"start": start, "eat": 0}
 
 
 Example:
@@ -301,7 +300,7 @@ You can implement your own step parser. It's interface is quite simple. The code
 
     @given(parsers.parse("there are %start% cucumbers"), target_fixture="cucumbers")
     def given_cucumbers(start):
-        return dict(start=start, eat=0)
+        return {"start": start, "eat": 0}
 
 
 Override fixtures via given steps

pyproject.toml

@@ -40,11 +40,13 @@ Mako = "*"
 parse = "*"
 parse-type = "*"
 pytest = ">=5.0"
+typing-extensions = "*"
 
 [tool.poetry.dev-dependencies]
 tox = "^3.25.1"
 mypy = "^0.961"
 types-setuptools = "^57.4.18"
+pytest-xdist = "^2.5.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

pytest_bdd/generation.py

@@ -9,7 +9,7 @@
 from mako.lookup import TemplateLookup
 
 from .feature import get_features
-from .scenario import find_argumented_step_fixture_name, make_python_docstring, make_python_name, make_string_literal
+from .scenario import find_argumented_step_function, make_python_docstring, make_python_name, make_string_literal
 from .steps import get_step_fixture_name
 from .types import STEP_TYPES
 
@@ -132,9 +132,9 @@ def _find_step_fixturedef(
     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)
+    step_func_context = find_argumented_step_function(name, type_, fixturemanager)
+    if step_func_context is not None:
+        return fixturemanager.getfixturedefs(step_func_context.name, item.nodeid)
     return None