Merge pull request #827 from Sanjays2402/fix-register-fixture-node-deprecation

fix: avoid deprecated nodeid argument to _register_fixture

Author: youtux

CHANGES.rst

@@ -34,6 +34,7 @@ Fixed
 * Backslashes in datatable and examples table cells are no longer over-quoted. A cell containing a single backslash now reaches the step as a single backslash, matching the Gherkin escaping rules. If you compensated by doubling backslashes in feature files, undo that. `#769 <https://github.com/pytest-dev/pytest-bdd/issues/769>`_
 * Made type annotations stronger and removed most of the ``typing.Any`` usages and ``# type: ignore`` annotations. `#658 <https://github.com/pytest-dev/pytest-bdd/pull/658>`_
 * Empty docstrings are now correctly forwarded to step functions as an empty string instead of being silently dropped, which previously caused pytest to report a missing ``docstring`` fixture. `#809 <https://github.com/pytest-dev/pytest-bdd/issues/809>`_
+* Injecting a ``target_fixture`` no longer emits ``PytestRemovedIn10Warning`` on pytest 9.1+, which deprecated passing ``nodeid`` to ``_register_fixture``. `#823 <https://github.com/pytest-dev/pytest-bdd/issues/823>`_
 
 Security
 ++++++++

src/pytest_bdd/compat.py

@@ -25,12 +25,18 @@ def inject_fixture(request: FixtureRequest, arg: str, value: object) -> None:
         :param arg: argument name
         :param value: argument value
         """
-        # Ensure there's a fixture definition for the argument
-        request._fixturemanager._register_fixture(
-            name=arg,
-            func=lambda: value,
-            nodeid=request.node.nodeid,
-        )
+        if pytest_version.release >= (9, 1):
+            request._fixturemanager._register_fixture(
+                name=arg,
+                func=lambda: value,
+                node=request.node,
+            )
+        else:
+            request._fixturemanager._register_fixture(
+                name=arg,
+                func=lambda: value,
+                nodeid=request.node.nodeid,
+            )
         # Note the fixture we just registered will have a lower priority
         # if there was already one registered, so we need to force its value
         # to the one we want to inject.

tests/steps/test_given.py

@@ -41,3 +41,48 @@ def _(foo):
     )
     result = pytester.runpytest()
     result.assert_outcomes(passed=1)
+
+
+def test_given_injection_no_deprecation_warning(pytester):
+    """Injecting a target fixture must not emit pytest deprecation warnings."""
+    pytester.makefile(
+        ".feature",
+        given=textwrap.dedent(
+            """\
+            Feature: Given
+                Scenario: Test given fixture injection
+                    Given I have injecting given
+                    Then foo should be "injected foo"
+            """
+        ),
+    )
+    pytester.makepyfile(
+        textwrap.dedent(
+            """\
+        from pytest_bdd import given, then, scenario
+
+        @scenario("given.feature", "Test given fixture injection")
+        def test_given():
+            pass
+
+
+        @given("I have injecting given", target_fixture="foo")
+        def _():
+            return "injected foo"
+
+
+        @then('foo should be "injected foo"')
+        def _(foo):
+            assert foo == "injected foo"
+
+        """
+        )
+    )
+    # fmt: off
+    result = pytester.runpytest(
+        "-W", "error::DeprecationWarning",
+        "-W", "error::PendingDeprecationWarning",
+        "-W", "ignore:A private pytest class or function was used:pytest.PytestDeprecationWarning",
+    )
+    # fmat: on
+    result.assert_outcomes(passed=1)

tox.ini

@@ -1,8 +1,9 @@
 [tox]
 # pytest 7.0-7.2 do not support python 3.12+
-envlist = py{3.10,3.11}-pytest{7.0,7.1,7.2}-gherkin_official{29,30,32,33,34,35,36,37,latest}-coverage
-          py{3.10,3.11,3.12,3.13,3.14}-pytest{7.3,7.4,8.0,8.1,8.2,8.3,9.0,latest}-gherkin_official{29,30,32,33,34,35,36,37,latest}-coverage
-          py3.15-pytestlatest-gherkin_officiallatest-coverage
+envlist = py{3.10,3.11}-pytest{7.0,7.1,7.2}-gherkin_officiallatest-coverage
+          py{3.10,3.11,3.12,3.13,3.14}-pytest{7.3,7.4,8.0,8.1,8.2,8.3,9.0,9.1,latest}-coverage
+          py{3.10,3.11,3.12,3.13,3.14}-gherkin_official{29,30,32,33,34,35,36,37,38,39,40,41,42,latest}-coverage
+          py3.15-coverage
           py3.12-pytestlatest-xdist-coverage
           mypy
 
@@ -13,6 +14,11 @@ setenv =
     xdist: _PYTEST_MORE_ARGS=-n3 -rfsxX
 deps =
     gherkin_officiallatest: gherkin-official
+    gherkin_official42: gherkin-official~=42.0.0
+    gherkin_official41: gherkin-official~=41.0.0
+    gherkin_official40: gherkin-official~=40.0.0
+    gherkin_official39: gherkin-official~=39.0.0
+    gherkin_official38: gherkin-official~=38.0.0
     gherkin_official37: gherkin-official~=37.0.0
     gherkin_official36: gherkin-official~=36.0.0
     gherkin_official35: gherkin-official~=35.0.0
@@ -23,6 +29,7 @@ deps =
     gherkin_official29: gherkin-official~=29.0.0
 
     pytestlatest: pytest
+    pytest9.1: pytest~=9.1.0
     pytest9.0: pytest~=9.0.0
     pytest8.3: pytest~=8.3.0
     pytest8.2: pytest~=8.2.0