From 19fb965237d254d95c18b619e3e15552a5da4835 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sat, 25 Sep 2021 07:58:12 -0400 Subject: [PATCH] help: Convert functional tests to non-BDD python format Signed-off-by: James Valleroy Reviewed-by: Sunil Mohan Adapa --- plinth/modules/help/tests/help.feature | 18 -------------- plinth/modules/help/tests/test_functional.py | 25 +++++++++++++------- 2 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 plinth/modules/help/tests/help.feature diff --git a/plinth/modules/help/tests/help.feature b/plinth/modules/help/tests/help.feature deleted file mode 100644 index 39d3955ca..000000000 --- a/plinth/modules/help/tests/help.feature +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later - -# TODO Scenario: Visit the wiki -# TODO Scenario: Visit the mailing list -# TODO Scenario: Visit the IRC channel -# TODO Scenario: View the manual -# TODO Scenario: View the about page - -@help @system @essential -Feature: Help module - Show various information about the system. - -Background: - Given I'm a logged in user - -Scenario: Status logs - When I go to the status logs page - Then status logs should be shown diff --git a/plinth/modules/help/tests/test_functional.py b/plinth/modules/help/tests/test_functional.py index c9b011c06..636aafb74 100644 --- a/plinth/modules/help/tests/test_functional.py +++ b/plinth/modules/help/tests/test_functional.py @@ -3,20 +3,27 @@ Functional, browser based tests for help app. """ -from pytest_bdd import scenarios, then, when - +import pytest from plinth.tests import functional -scenarios('help.feature') +pytestmark = [pytest.mark.system, pytest.mark.essential, pytest.mark.help] + +# TODO Scenario: Visit the wiki +# TODO Scenario: Visit the mailing list +# TODO Scenario: Visit the IRC channel +# TODO Scenario: View the manual +# TODO Scenario: View the about page -@when('I go to the status logs page') -def help_go_to_status_logs(session_browser): +@pytest.fixture(scope='module', autouse=True) +def fixture_background(session_browser): + """Login.""" + functional.login(session_browser) + + +def test_view_status_logs(session_browser): + """Test viewing the status logs.""" _go_to_status_logs(session_browser) - - -@then('status logs should be shown') -def help_status_logs_are_shown(session_browser): assert _are_status_logs_shown(session_browser)