Fix behave fullname (#561)

sseliverstov · web-flow · commit 27bf63c2130a · 2021-02-04T02:36:04.000+03:00
diff --git a/allure-behave/features/test_plan.feature b/allure-behave/features/test_plan.feature
@@ -26,10 +26,10 @@ Feature: Test plan
         "version":"1.0",
         "tests": [
           {
-            "selector": "<string>:Scenario with passed step"
+            "selector": "Test plan example: Scenario with passed step"
           },
           {
-            "selector": "<string>:Another scenario with passed step"
+            "selector": "Another Test plan example: Another scenario with passed step"
           }
         ]
       }
diff --git a/allure-behave/src/utils.py b/allure-behave/src/utils.py
@@ -95,7 +95,7 @@ def get_status(exception):
 def get_fullname(scenario):
     name_with_param = scenario_name(scenario)
     name = name_with_param.rsplit(" -- ")[0]
-    return "{filename}:{name}".format(filename=scenario.filename, name=name)
+    return "{filename}: {name}".format(filename=scenario.feature.name, name=name)
 
 
 def step_status_details(result):
diff --git a/allure-pytest/test/acceptance/status/base_call_status_test.py b/allure-pytest/test/acceptance/status/base_call_status_test.py
@@ -62,7 +62,7 @@ def test_call_pytest_fail(executed_docstring_source):
     assert_that(executed_docstring_source.allure_report,
                 has_test_case("test_call_pytest_fail_example",
                               with_status("failed"),
-                              has_status_details(with_message_contains("Failed: <Failed instance>"),
+                              has_status_details(with_message_contains("Failed"),
                                                  with_trace_contains("def test_call_pytest_fail_example():")
                                                  )
                               )
diff --git a/allure-pytest/test/acceptance/status/base_setup_status_test.py b/allure-pytest/test/acceptance/status/base_setup_status_test.py
@@ -83,12 +83,12 @@ def test_skip_fixture(executed_docstring_source):
     assert_that(executed_docstring_source.allure_report,
                 has_test_case("test_skip_fixture_example",
                               with_status("skipped"),
-                              has_status_details(with_message_contains("Skipped: <Skipped instance>")),
+                              has_status_details(with_message_contains("Skipped")),
                               has_container(executed_docstring_source.allure_report,
                                             has_before("skip_fixture",
                                                        with_status("skipped"),
                                                        has_status_details(
-                                                           with_message_contains("Skipped: <Skipped instance>"),
+                                                           with_message_contains("Skipped"),
                                                            with_trace_contains("skip_fixture")
                                                        ),
                                                        ),
@@ -112,14 +112,14 @@ def test_pytest_fail_fixture(executed_docstring_source):
     assert_that(executed_docstring_source.allure_report,
                 has_test_case("test_pytest_fail_fixture_example",
                               with_status("failed"),
-                              has_status_details(with_message_contains("Failed: <Failed instance>"),
+                              has_status_details(with_message_contains("Failed"),
                                                  with_trace_contains("def pytest_fail_fixture():")
                                                  ),
                               has_container(executed_docstring_source.allure_report,
                                             has_before("pytest_fail_fixture",
                                                        with_status("failed"),
                                                        has_status_details(
-                                                           with_message_contains("Failed: <Failed instance>"),
+                                                           with_message_contains("Failed"),
                                                            with_trace_contains("pytest_fail_fixture")
                                                        ),
                                                        ),
diff --git a/allure-pytest/test/acceptance/status/base_step_status_test.py b/allure-pytest/test/acceptance/status/base_step_status_test.py
@@ -45,12 +45,12 @@ def test_pytest_fail_in_step(executed_docstring_source):
     assert_that(executed_docstring_source.allure_report,
                 has_test_case("test_pytest_fail_in_step_example",
                               with_status("failed"),
-                              has_status_details(with_message_contains("Failed: <Failed instance>"),
+                              has_status_details(with_message_contains("Failed"),
                                                  with_trace_contains("def test_pytest_fail_in_step_example():")
                                                  ),
                               has_step("Step",
                                        with_status("failed"),
-                                       has_status_details(with_message_contains("Failed: <Failed instance>"),
+                                       has_status_details(with_message_contains("Failed"),
                                                           with_trace_contains("test_pytest_fail_in_step_example")
                                                           )
                                        )
diff --git a/allure-pytest/test/acceptance/status/base_teardown_status_test.py b/allure-pytest/test/acceptance/status/base_teardown_status_test.py
@@ -59,15 +59,15 @@ def test_pytest_failed_finalizer_fixture(executed_docstring_source):
     assert_that(executed_docstring_source.allure_report,
                 has_test_case("test_pytest_failed_finalizer_fixture_example",
                               with_status("failed"),
-                              has_status_details(with_message_contains("Failed: <Failed instance>"),
+                              has_status_details(with_message_contains("Failed"),
                                                  with_trace_contains("def fixture_finalizer():")
                                                  ),
                               has_container(executed_docstring_source.allure_report,
                                             has_after("{fixture}::{finalizer}".format(
                                                 fixture="pytest_failed_finalizer_fixture",
                                                 finalizer="fixture_finalizer"),
                                                 with_status("failed"),
-                                                has_status_details(with_message_contains("Failed: <Failed instance>"),
+                                                has_status_details(with_message_contains("Failed"),
                                                                    with_trace_contains("fixture_finalizer")
                                                                    ),
                                             ),
diff --git a/allure-pytest/test/acceptance/status/skip_call_status_test.py b/allure-pytest/test/acceptance/status/skip_call_status_test.py
@@ -16,7 +16,7 @@ def test_skip(executed_docstring_source):
     assert_that(executed_docstring_source.allure_report,
                 has_test_case("test_skip_example",
                               with_status("skipped"),
-                              has_status_details(with_message_contains("Skipped: <Skipped instance>"))
+                              has_status_details(with_message_contains("Skipped"))
                               )
                 )
 
diff --git a/allure-pytest/test/acceptance/status/skip_setup_status_test.py b/allure-pytest/test/acceptance/status/skip_setup_status_test.py
@@ -26,12 +26,12 @@ def test_skip_fixture(executed_docstring_source):
     assert_that(executed_docstring_source.allure_report,
                 has_test_case("test_skip_fixture_example",
                               with_status("skipped"),
-                              has_status_details(with_message_contains("Skipped: <Skipped instance>")),
+                              has_status_details(with_message_contains("Skipped")),
                               has_container(executed_docstring_source.allure_report,
                                             has_before("skip_fixture",
                                                        with_status("skipped"),
                                                        has_status_details(
-                                                           with_message_contains("Skipped: <Skipped instance>"),
+                                                           with_message_contains("Skipped"),
                                                            with_trace_contains("skip_fixture")
                                                        ),
                                                        ),
diff --git a/allure-pytest/test/acceptance/status/skip_step_status_test.py b/allure-pytest/test/acceptance/status/skip_step_status_test.py
@@ -20,10 +20,10 @@ def test_skip_in_step(executed_docstring_source):
     assert_that(executed_docstring_source.allure_report,
                 has_test_case("test_skip_in_step_example",
                               with_status("skipped"),
-                              has_status_details(with_message_contains("Skipped: <Skipped instance>")),
+                              has_status_details(with_message_contains("Skipped")),
                               has_step("Step",
                                        with_status("skipped"),
-                                       has_status_details(with_message_contains("Skipped: <Skipped instance>"),
+                                       has_status_details(with_message_contains("Skipped"),
                                                           with_trace_contains("test_skip_in_step")
                                                           )
                                        )
diff --git a/allure-pytest/test/acceptance/status/skip_teardown_status_test.py b/allure-pytest/test/acceptance/status/skip_teardown_status_test.py
@@ -30,7 +30,7 @@ def test_skip_finalizer_fixture(executed_docstring_source):
                                                 fixture="skip_finalizer_fixture",
                                                 finalizer="fixture_finalizer"),
                                                 with_status("skipped"),
-                                                has_status_details(with_message_contains("Skipped: <Skipped instance>"),
+                                                has_status_details(with_message_contains("Skipped"),
                                                                    with_trace_contains("fixture_finalizer")
                                                                    ),
                                             ),

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@ Feature: Test plan`
`26`	`26`	`"version":"1.0",`
`27`	`27`	`"tests": [`
`28`	`28`	`{`
`29`		`- "selector": "<string>:Scenario with passed step"`
	`29`	`+ "selector": "Test plan example: Scenario with passed step"`
`30`	`30`	`},`
`31`	`31`	`{`
`32`		`- "selector": "<string>:Another scenario with passed step"`
	`32`	`+ "selector": "Another Test plan example: Another scenario with passed step"`
`33`	`33`	`}`
`34`	`34`	`]`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ def test_call_pytest_fail(executed_docstring_source):`
`62`	`62`	`assert_that(executed_docstring_source.allure_report,`
`63`	`63`	`has_test_case("test_call_pytest_fail_example",`
`64`	`64`	`with_status("failed"),`
`65`		`- has_status_details(with_message_contains("Failed: <Failed instance>"),`
	`65`	`+ has_status_details(with_message_contains("Failed"),`
`66`	`66`	`with_trace_contains("def test_call_pytest_fail_example():")`
`67`	`67`	`)`
`68`	`68`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ def test_skip(executed_docstring_source):`
`16`	`16`	`assert_that(executed_docstring_source.allure_report,`
`17`	`17`	`has_test_case("test_skip_example",`
`18`	`18`	`with_status("skipped"),`
`19`		`- has_status_details(with_message_contains("Skipped: <Skipped instance>"))`
	`19`	`+ has_status_details(with_message_contains("Skipped"))`
`20`	`20`	`)`
`21`	`21`	`)`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@ def test_skip_in_step(executed_docstring_source):`
`20`	`20`	`assert_that(executed_docstring_source.allure_report,`
`21`	`21`	`has_test_case("test_skip_in_step_example",`
`22`	`22`	`with_status("skipped"),`
`23`		`- has_status_details(with_message_contains("Skipped: <Skipped instance>")),`
	`23`	`+ has_status_details(with_message_contains("Skipped")),`
`24`	`24`	`has_step("Step",`
`25`	`25`	`with_status("skipped"),`
`26`		`- has_status_details(with_message_contains("Skipped: <Skipped instance>"),`
	`26`	`+ has_status_details(with_message_contains("Skipped"),`
`27`	`27`	`with_trace_contains("test_skip_in_step")`
`28`	`28`	`)`
`29`	`29`	`)`