diff options
Diffstat (limited to 'tests/end2end/features/test_qutescheme_bdd.py')
| -rw-r--r-- | tests/end2end/features/test_qutescheme_bdd.py | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/tests/end2end/features/test_qutescheme_bdd.py b/tests/end2end/features/test_qutescheme_bdd.py index e120cd2e7..3b6145988 100644 --- a/tests/end2end/features/test_qutescheme_bdd.py +++ b/tests/end2end/features/test_qutescheme_bdd.py @@ -19,17 +19,12 @@ import pytest_bdd as bdd -from qutebrowser.utils import qtutils - bdd.scenarios('qutescheme.feature') @bdd.then(bdd.parsers.parse("the {kind} request should be blocked")) def request_blocked(request, quteproc, kind): - blocking_set_msg = ( - "Blocking malicious request from qute://settings/set?* to " - "qute://settings/set?*") blocking_csrf_msg = ( "Blocking malicious request from " "http://localhost:*/data/misc/qutescheme_csrf.html to " @@ -39,7 +34,6 @@ def request_blocked(request, quteproc, kind): "load local resource: qute://settings/set?*" ) unsafe_redirect_msg = "Load error: ERR_UNSAFE_REDIRECT" - blocked_request_msg = "Load error: ERR_BLOCKED_BY_CLIENT" webkit_error_invalid = ( "Error while loading qute://settings/set?*: Invalid qute://settings " @@ -48,18 +42,14 @@ def request_blocked(request, quteproc, kind): "Error while loading qute://settings/set?*: Unsupported request type") if request.config.webengine: - # On Qt 5.12, we mark qute:// as a local scheme, causing most requests - # being blocked by Chromium internally (logging to the JS console). + # We mark qute:// as a local scheme, causing most requests being blocked + # by Chromium internally (logging to the JS console). expected_messages = { 'img': [blocking_js_msg], 'link': [blocking_js_msg], - 'redirect': [blocking_set_msg, blocked_request_msg], + 'redirect': [unsafe_redirect_msg], 'form': [blocking_js_msg], } - if qtutils.version_check('5.15', compiled=False): - # On Qt 5.15, Chromium blocks the redirect as ERR_UNSAFE_REDIRECT - # instead. - expected_messages['redirect'] = [unsafe_redirect_msg] else: # QtWebKit expected_messages = { 'img': [blocking_csrf_msg], |