From 5fd8abcc1fc519877b38a02c0da2c0259c37eb1e Mon Sep 17 00:00:00 2001 From: Michael Pimmer Date: Fri, 16 Nov 2018 09:41:41 +0100 Subject: [PATCH] Backups: minor fixes of functional tests Reviewed-by: James Valleroy --- functional_tests/step_definitions/system.py | 6 ++++++ functional_tests/support/system.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/functional_tests/step_definitions/system.py b/functional_tests/step_definitions/system.py index c8932f94a..8ca275a9e 100644 --- a/functional_tests/step_definitions/system.py +++ b/functional_tests/step_definitions/system.py @@ -17,6 +17,7 @@ import os +from pytest import fixture from pytest_bdd import given, parsers, then, when from support import system @@ -38,6 +39,11 @@ language_codes = { } +@fixture(scope='session') +def downloaded_file_info(): + return dict() + + @given(parsers.parse('the default app is {app_name:w}')) def set_default_app(browser, app_name): system.set_default_app(browser, app_name) diff --git a/functional_tests/support/system.py b/functional_tests/support/system.py index 03e410f31..f15f11879 100644 --- a/functional_tests/support/system.py +++ b/functional_tests/support/system.py @@ -222,7 +222,7 @@ def backup_upload_and_restore(browser, app_name, downloaded_file_path): # submit upload form submit(browser) # submit restore form - with wait_for_page_update(browser, expected_url='/plinth/sys/backups/'): + with wait_for_page_update(browser): submit(browser)