Patch pytest-bdd fixture injection (#2112)

Issue: pytest-dev/pytest-bdd#689
Fix: pytest-dev/pytest-bdd#690

Since that issue has been open for months, we incorporate a patch here to be removed when the fix is merged upstream.

Author: jace

requirements/test.in

@@ -5,7 +5,7 @@ coveralls
 lxml
 pytest
 pytest-asyncio
-pytest-bdd
+pytest-bdd  # See tests/conftest.py for a patch for version 7.2.0
 pytest-cov
 pytest-dotenv
 pytest-env

requirements/test.txt

@@ -33,7 +33,7 @@ parse-type==0.6.2
     # via pytest-bdd
 pluggy==1.5.0
     # via pytest
-pytest==8.0.0
+pytest==8.3.2
     # via
     #   -r requirements/test.in
     #   pytest-asyncio
@@ -50,7 +50,7 @@ pytest-asyncio==0.23.8
     # via -r requirements/test.in
 pytest-base-url==2.1.0
     # via pytest-playwright
-pytest-bdd==7.0.1
+pytest-bdd==7.2.0
     # via -r requirements/test.in
 pytest-cov==5.0.0
     # via -r requirements/test.in

tests/conftest.py

@@ -130,6 +130,68 @@ def pytest_runtest_call(item: pytest.Function) -> None:
             typeguard.check_type(item.funcargs[attr], type_)
 
 
+# MARK: Pytest-bdd patch ---------------------------------------------------------------
+
+
+@pytest.fixture(scope='session', autouse=True)
+def _patch_pytest_bdd_inject_fixture() -> None:
+    """Patch pytest-bdd 7.2.0 for pytest 8.1."""
+    # Reported issue: https://github.com/pytest-dev/pytest-bdd/issues/689
+    # Pending fix: https://github.com/pytest-dev/pytest-bdd/pull/690
+    # Remove this function when that PR is accepted and incorporated in a release
+
+    # pylint: disable=protected-access
+    from _pytest.fixtures import FixtureDef, FixtureRequest
+
+    def inject_fixture(request: FixtureRequest, arg: str, value: Any) -> None:
+        """
+        Inject fixture into pytest fixture request.
+
+        :param request: pytest fixture request
+        :param arg: argument name
+        :param value: argument value
+        """
+        fd = FixtureDef(
+            config=request._fixturemanager.config,
+            baseid=request.node.nodeid,
+            argname=arg,
+            func=lambda: value,
+            scope="function",
+            params=None,
+            ids=None,
+            _ispytest=True,
+        )
+
+        fd.cached_result = (value, 0, None)
+
+        old_fd = request._fixture_defs.get(arg)
+        add_fixturename = arg not in request.fixturenames
+
+        def fin() -> None:
+            request._fixturemanager._arg2fixturedefs[arg].remove(fd)
+
+            if old_fd is not None:
+                request._fixture_defs[arg] = old_fd
+
+            if add_fixturename:
+                request._pyfuncitem._fixtureinfo.names_closure.remove(arg)
+
+        request.addfinalizer(fin)
+
+        # inject fixture definition
+        request._fixturemanager._arg2fixturedefs.setdefault(arg, []).append(fd)
+
+        # inject fixture value in request cache
+        request._fixture_defs[arg] = fd
+        if add_fixturename:
+            request._pyfuncitem._fixtureinfo.names_closure.append(arg)
+
+    # Apply patch to the (sole) function using it
+    from pytest_bdd.scenario import _execute_step_function
+
+    _execute_step_function.__globals__['inject_fixture'] = inject_fixture
+
+
 # MARK: Playwright browser config ------------------------------------------------------