Skip to content

Fix behave fullname #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions allure-behave/features/test_plan.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion allure-behave/src/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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():")
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
),
),
Expand All @@ -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")
),
),
Expand Down
4 changes: 2 additions & 2 deletions allure-pytest/test/acceptance/status/base_step_status_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
)
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
),
),
Expand Down
4 changes: 2 additions & 2 deletions allure-pytest/test/acceptance/status/skip_step_status_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
),
),
Expand Down