use native name for scenario outlines (fixes #212 via #253)

Author: sseliverstov

allure-behave/features/scenario_outline.feature

@@ -15,11 +15,11 @@ Feature: Scenario Outline
         """
      When I run behave with allure formatter
 
-     Then allure report has a scenario with name "Scenario outline with one examples table"
+     Then allure report has a scenario with name "Scenario outline with one examples table -- @1.1 examples table"
       And scenario contains step "Given simple passed step with param "Alice""
       And this scenario has parameter "user" with value "Alice"
 
-     Then allure report has a scenario with name "Scenario outline with one examples table"
+     Then allure report has a scenario with name "Scenario outline with one examples table -- @1.2 examples table"
       And scenario contains step "Given simple passed step with param "Bob""
       And this scenario has parameter "user" with value "Bob"
 
@@ -43,22 +43,22 @@ Feature: Scenario Outline
         """
      When I run behave with allure formatter
 
-     Then allure report has a scenario with name "Scenario outline with many examples table"
+     Then allure report has a scenario with name "Scenario outline with many examples table -- @1.1 first table"
       And scenario contains step "Given simple passed step with params "Peter I""
       And this scenario has parameter "parameter one" with value "Peter"
       And this scenario has parameter "parameter two" with value "I"
 
-     Then allure report has a scenario with name "Scenario outline with many examples table"
+     Then allure report has a scenario with name "Scenario outline with many examples table -- @1.2 first table"
       And scenario contains step "Given simple passed step with params "Catherine II""
       And this scenario has parameter "parameter one" with value "Catherine"
       And this scenario has parameter "parameter two" with value "II"
 
-     Then allure report has a scenario with name "Scenario outline with many examples table"
+     Then allure report has a scenario with name "Scenario outline with many examples table -- @2.1 second table"
       And scenario contains step "Given simple passed step with params "Richard the Lionheart""
       And this scenario has parameter "parameter one" with value "Richard"
       And this scenario has parameter "parameter two" with value "the Lionheart"
 
-     Then allure report has a scenario with name "Scenario outline with many examples table"
+     Then allure report has a scenario with name "Scenario outline with many examples table -- @2.2 second table"
       And scenario contains step "Given simple passed step with params "Alexander the Great""
       And this scenario has parameter "parameter one" with value "Alexander"
       And this scenario has parameter "parameter two" with value "the Great"
@@ -88,18 +88,39 @@ Feature: Scenario Outline
         """
      When I run behave with allure formatter
 
-     Then allure report has a scenario with name "First scenario outline in feature"
+     Then allure report has a scenario with name "First scenario outline in feature -- @1.1 examples table"
       And scenario contains step "Given simple passed step with param "Rick""
       And this scenario has parameter "friend" with value "Rick"
 
-     Then allure report has a scenario with name "First scenario outline in feature"
+     Then allure report has a scenario with name "First scenario outline in feature -- @1.2 examples table"
       And scenario contains step "Given simple passed step with param "Morty""
       And this scenario has parameter "friend" with value "Morty"
 
-     Then allure report has a scenario with name "Second scenario outline in feature"
+     Then allure report has a scenario with name "Second scenario outline in feature -- @1.1 examples table"
       And scenario contains step "Given simple passed step with param "Finn""
       And this scenario has parameter "hero" with value "Finn"
 
-     Then allure report has a scenario with name "Second scenario outline in feature"
+     Then allure report has a scenario with name "Second scenario outline in feature -- @1.2 examples table"
       And scenario contains step "Given simple passed step with param "Jack""
       And this scenario has parameter "hero" with value "Jack"
+
+  Scenario Outline: Scenario outline with one examples table
+    Given feature definition
+        """
+        Feature: Scenario Outline
+
+          Scenario Outline: Scenario outline with example variable <user> in name
+            Given simple passed step with param "<user>"
+
+            Examples: examples table
+            | user  |
+            | Alice |
+            | Bob   |
+        """
+    When I run behave with allure formatter
+    Then allure report has a scenario with name "Scenario outline with example variable <user> in name <postfix>"
+
+    Examples: examples table
+            | user  | postfix                 |
+            | Alice |  -- @1.1 examples table |
+            | Bob   |  -- @1.2 examples table |

allure-behave/src/utils.py

@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 
 from enum import Enum
-from behave.model import ScenarioOutline
 from behave.runner_util import make_undefined_step_snippet
 from allure_commons.types import Severity
 from allure_commons.model2 import Status, Parameter
@@ -20,10 +19,6 @@
 
 
 def scenario_name(scenario):
-    scenario_outlines = [so for so in scenario.feature if isinstance(so, ScenarioOutline)]
-    current_scenario_outline = next(iter(filter(lambda so: scenario in so.scenarios, scenario_outlines)), None)
-    if current_scenario_outline:
-        return current_scenario_outline.name if current_scenario_outline.name else current_scenario_outline.keyword
     return scenario.name if scenario.name else scenario.keyword
 
 

allure-python-commons-test/src/report.py

@@ -74,7 +74,7 @@
 from hamcrest import has_property
 from hamcrest import has_item
 from hamcrest import has_entry
-from hamcrest import ends_with
+from hamcrest import ends_with, starts_with
 from hamcrest.core.base_matcher import BaseMatcher
 
 if sys.version_info[0] < 3:
@@ -101,7 +101,7 @@ def has_test_case(name, *matchers):
                                  all_of(
                                         any_of(
                                                has_entry('fullName', ends_with(name)),
-                                               has_entry('name', ends_with(name))
+                                               has_entry('name', starts_with(name))
                                                ),
                                         *matchers
                                         )