diff --git a/allure-behave/features/test_plan.feature b/allure-behave/features/test_plan.feature index 56e0a7f1..5657840e 100644 --- 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": ":Scenario with passed step" + "selector": "Test plan example: Scenario with passed step" }, { - "selector": ":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 index 9eae31c2..1b369bc9 100644 --- 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 index 031a63ef..a7f96364 100644 --- 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: "), + 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 index c1f4e7fe..9cec930c 100644 --- 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: ")), + 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: "), + 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: "), + 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: "), + 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 index b61ce4eb..46aa6888 100644 --- 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: "), + 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: "), + 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 index f7267c62..217ecbdb 100644 --- a/allure-pytest/test/acceptance/status/base_teardown_status_test.py +++ b/allure-pytest/test/acceptance/status/base_teardown_status_test.py @@ -59,7 +59,7 @@ 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: "), + has_status_details(with_message_contains("Failed"), with_trace_contains("def fixture_finalizer():") ), has_container(executed_docstring_source.allure_report, @@ -67,7 +67,7 @@ def test_pytest_failed_finalizer_fixture(executed_docstring_source): fixture="pytest_failed_finalizer_fixture", finalizer="fixture_finalizer"), with_status("failed"), - has_status_details(with_message_contains("Failed: "), + 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 index fcb66923..70844f28 100644 --- 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: ")) + 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 index 3b50db0f..186bd601 100644 --- 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: ")), + 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: "), + 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 index e92f4125..637ed838 100644 --- 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: ")), + has_status_details(with_message_contains("Skipped")), has_step("Step", with_status("skipped"), - has_status_details(with_message_contains("Skipped: "), + 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 index 66096cd1..14ea0530 100644 --- 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: "), + has_status_details(with_message_contains("Skipped"), with_trace_contains("fixture_finalizer") ), ),