From 6cdb5c41ec7b392f6a0c743af2dea89161c8a8ea Mon Sep 17 00:00:00 2001 From: Taka Date: Sun, 25 Apr 2021 07:00:22 +1000 Subject: [PATCH] Use Firefox as the default webdriver for tests. --- asl_rulebook2/webapp/tests/test_underscores_in_ruleids.py | 4 +++- conftest.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/asl_rulebook2/webapp/tests/test_underscores_in_ruleids.py b/asl_rulebook2/webapp/tests/test_underscores_in_ruleids.py index 3c69f28..ca783c6 100644 --- a/asl_rulebook2/webapp/tests/test_underscores_in_ruleids.py +++ b/asl_rulebook2/webapp/tests/test_underscores_in_ruleids.py @@ -23,7 +23,9 @@ def test_search_results( webdriver, webapp ): refresh_webapp( webdriver ) results = do_search( ruleid ) assert results == [] - assert get_curr_target() == ( 'kampfgruppe-scherer!', 'KGS_CG1' ) + wait_for( 2, + lambda: get_curr_target() == ( 'kampfgruppe-scherer!', 'KGS_CG1' ) + ) # --------------------------------------------------------------------- diff --git a/conftest.py b/conftest.py index 90df879..cde5da3 100644 --- a/conftest.py +++ b/conftest.py @@ -33,8 +33,8 @@ def pytest_addoption( parser ): help="Webapp server to test against." ) parser.addoption( - "--webdriver", action="store", dest="webdriver", default="chrome", - help="Webdriver to use (Chrome/Firefox)." + "--webdriver", action="store", dest="webdriver", default="firefox", + help="Webdriver to use (chrome/firefox)." ) parser.addoption( "--headless", action="store_true", dest="headless", default=False,