Remove fix to expose kwargs

Author: jsa34

src/pytest_bdd/scenario.py

@@ -14,7 +14,6 @@
 from __future__ import annotations
 
 import contextlib
-import inspect
 import logging
 import os
 import re
@@ -192,31 +191,25 @@ def _execute_step_function(
     converters = context.converters
     kwargs = {}
     args = get_args(context.step_func)
-    signature = inspect.signature(context.step_func)  # Get function signature
 
     try:
         parsed_args = context.parser.parse_arguments(step.name)
         assert parsed_args is not None, (
             f"Unexpected `NoneType` returned from " f"parse_arguments(...) in parser: {context.parser!r}"
         )
 
-        if step.datatable is not None:
-            kwargs["datatable"] = step.datatable.raw()
-
-        if step.docstring is not None:
-            kwargs["docstring"] = step.docstring
-
         for arg, value in parsed_args.items():
             if arg in converters:
                 value = converters[arg](value)
             kwargs[arg] = value
 
-        step_func_explicit_args = {arg: kwargs[arg] if arg in kwargs else request.getfixturevalue(arg) for arg in args}
+        if step.datatable is not None:
+            kwargs["datatable"] = step.datatable.raw()
+
+        if step.docstring is not None:
+            kwargs["docstring"] = step.docstring
 
-        if any(param.kind == param.VAR_KEYWORD for param in signature.parameters.values()):
-            kwargs = {**kwargs, **step_func_explicit_args}
-        else:
-            kwargs = step_func_explicit_args
+        kwargs = {arg: kwargs[arg] if arg in kwargs else request.getfixturevalue(arg) for arg in args}
 
         kw["step_func_args"] = kwargs
 

tests/steps/test_docstring.py

@@ -140,51 +140,6 @@ def test_docstring():
     result.stdout.fnmatch_lines(["*fixture 'docstring' not found*"])
 
 
-def test_steps_with_docstring_in_kwargs(pytester):
-    pytester.makefile(
-        ".feature",
-        docstring_kwarg=textwrap.dedent(
-            '''\
-            Feature: Docstring in kwargs
-
-              Scenario: Docstring is in step kwargs
-                Given this step has a docstring
-                """
-                This is a given docstring
-                """
-            '''
-        ),
-    )
-    pytester.makeconftest(
-        textwrap.dedent(
-            """\
-        from pytest_bdd import given
-
-
-        @given("this step has a docstring")
-        def _(**kwargs):
-            print(kwargs['docstring'])
-
-
-    """
-        )
-    )
-
-    pytester.makepyfile(
-        textwrap.dedent(
-            """\
-        from pytest_bdd import scenario
-
-        @scenario("docstring_kwarg.feature", "Docstring is in step kwargs")
-        def test_docstring():
-            pass
-        """
-        )
-    )
-    result = pytester.runpytest("-s")
-    result.assert_outcomes(passed=1)
-
-
 def test_steps_with_docstring_missing_argument_in_step_def(pytester):
     pytester.makefile(
         ".feature",