From 17caf80f2a2b0a1a9de3bf0d880fc6512c6b9d5e Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 10 Sep 2016 15:50:00 +0200 Subject: [PATCH] bdd: Add "I wait for the javascript message" step --- tests/end2end/features/conftest.py | 6 ++++++ tests/end2end/features/misc.feature | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py index ea8fbda0b..4cbf5bd90 100644 --- a/tests/end2end/features/conftest.py +++ b/tests/end2end/features/conftest.py @@ -329,6 +329,12 @@ def wait_scroll_position_arg(quteproc, x, y): quteproc.wait_scroll_pos_changed(x, y) +@bdd.when(bdd.parsers.parse('I wait for the javascript message "{message}"')) +def javascript_message_when(quteproc, message): + """Make sure the given message was logged via javascript.""" + quteproc.wait_for_js(message) + + ## Then diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature index 43e6c65f0..3a2a7ea5d 100644 --- a/tests/end2end/features/misc.feature +++ b/tests/end2end/features/misc.feature @@ -64,7 +64,7 @@ Feature: Various utility commands. Scenario: :jseval When I set general -> log-javascript-console to info And I run :jseval console.log("Hello from JS!"); - And I wait for "[:*] Hello from JS!" in the log + And I wait for the javascript message "Hello from JS!" Then the message "No output or error" should be shown Scenario: :jseval without logging @@ -76,7 +76,7 @@ Feature: Various utility commands. Scenario: :jseval with --quiet When I set general -> log-javascript-console to info And I run :jseval --quiet console.log("Hello from JS!"); - And I wait for "[:*] Hello from JS!" in the log + And I wait for the javascript message "Hello from JS!" Then "No output or error" should not be logged Scenario: :jseval with a value