Fix parameters parsing from "Scenario Outline" for pytest-bdd >= 5.0.0 (fixes allure-framework#636) (allure-framework#716)

janxen · delatrie · GilBecker-Anaplan · commit 5469352b69ef · 2023-04-10T14:24:15.000+03:00
Co-authored-by: Maxim &lt;17935127+delatrie@users.noreply.github.com&gt;
diff --git a/allure-pytest-bdd/features/outline.feature b/allure-pytest-bdd/features/outline.feature
@@ -16,17 +16,17 @@ Feature: Scenario outline
     And example_test.py with content:
       """
       from pytest_bdd import scenario
-      from pytest_bdd import given, then, when
+      from pytest_bdd import given, then, when, parsers
 
-      @given("<first> step")
+      @given(parsers.parse("{first} step"))
       def given_step(first):
           pass
 
       @when("do nothing")
       def nope_step():
           pass
 
-      @then("step with <second> param")
+      @then(parsers.parse("step with {second} param"))
       def then_step(second):
           pass
 
@@ -39,13 +39,13 @@ Feature: Scenario outline
     Then allure report has result for "Outline example" scenario
     Then this scenario has parameter "first" with value "Alpha"
     Then this scenario has parameter "second" with value "1"
-    Then this scenario contains "Given <Alpha> step" step
-    Then this scenario contains "Then step with <1> param" step
+    Then this scenario contains "Given Alpha step" step
+    Then this scenario contains "Then step with 1 param" step
 
     Then allure report has result for "Outline example" scenario
     Then this scenario has parameter "first" with value "Bravo"
     Then this scenario has parameter "second" with value "2"
-    Then this scenario contains "Given <Bravo> step" step
-    Then this scenario contains "Then step with <2> param" step
+    Then this scenario contains "Given Bravo step" step
+    Then this scenario contains "Then step with 2 param" step
 
 
diff --git a/allure-pytest-bdd/src/utils.py b/allure-pytest-bdd/src/utils.py
@@ -40,14 +40,8 @@ def get_name(node, scenario):
 from allure_commons.utils import format_exception
 
 
-def get_step_name(node, step):
-    name = f"{step.keyword} {step.name}"
-    if hasattr(node, 'callspec'):
-        params = node.callspec.params
-        for key in params:
-            name = name.replace(f"<{key}>", f"<{{{key}}}>")
-            name = name.format(**params)
-    return name
+def get_step_name(step):
+    return f"{step.keyword} {step.name}"
 
 
 def get_name(node, scenario):
@@ -83,7 +77,9 @@ def get_pytest_report_status(pytest_report):
 
 def get_params(node):
     if hasattr(node, 'callspec'):
-        params = node.callspec.params
+        params = dict(node.callspec.params)
+        outline_params = params.pop('_pytest_bdd_example', {})
+        params.update(outline_params)
         return [Parameter(name=name, value=value) for name, value in params.items()]
 
 
