summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2019-02-17 17:14:33 +0100
committerFlorian Bruhin <me@the-compiler.org>2019-02-17 17:15:03 +0100
commit64f7692d749df2999eaa50bcbabc1bdcaccfd351 (patch)
tree98ac4f738aaf3acf28157caed9b56362b77be568
parent39cc35225369d90625fd084fc588f14824929e01 (diff)
downloadqutebrowser-64f7692d749df2999eaa50bcbabc1bdcaccfd351.tar.gz
qutebrowser-64f7692d749df2999eaa50bcbabc1bdcaccfd351.zip
Update qute://settings CSRF tests for Qt 5.12
See #4478
-rw-r--r--tests/end2end/features/test_qutescheme_bdd.py20
1 files changed, 19 insertions, 1 deletions
diff --git a/tests/end2end/features/test_qutescheme_bdd.py b/tests/end2end/features/test_qutescheme_bdd.py
index a4335640e..9976d0785 100644
--- a/tests/end2end/features/test_qutescheme_bdd.py
+++ b/tests/end2end/features/test_qutescheme_bdd.py
@@ -20,6 +20,10 @@
import re
import pytest_bdd as bdd
+
+from qutebrowser.utils import qtutils
+
+
bdd.scenarios('qutescheme.feature')
@@ -32,13 +36,27 @@ def request_blocked(request, quteproc, kind):
"Blocking malicious request from "
"http://localhost:*/data/misc/qutescheme_csrf.html to "
"qute://settings/set?*")
+ blocking_js_msg = (
+ "[http://localhost:*/data/misc/qutescheme_csrf.html:0] Not allowed to "
+ "load local resource: qute://settings/set?*"
+ )
+
webkit_error_invalid = (
"Error while loading qute://settings/set?*: Invalid qute://settings "
"request")
webkit_error_unsupported = (
"Error while loading qute://settings/set?*: Unsupported request type")
- if request.config.webengine:
+ if request.config.webengine and qtutils.version_check('5.12'):
+ # On Qt 5.12, 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],
+ 'form': [blocking_js_msg],
+ }
+ elif request.config.webengine:
expected_messages = {
'img': [blocking_csrf_msg],
'link': [blocking_set_msg],