diff options
| author | Florian Bruhin <git@the-compiler.org> | 2016-11-10 21:20:43 +0100 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2016-11-10 22:45:27 +0100 |
| commit | 6b14cda5d084845103ef5faebf1099f4e04f658f (patch) | |
| tree | 440a83f0c68aae040ddbf3107c0338a875b8c262 /tests/end2end | |
| parent | 2d23ed52debc9be3770a3517fb5f2a8de2eca15c (diff) | |
| download | qutebrowser-6b14cda5d084845103ef5faebf1099f4e04f658f.tar.gz qutebrowser-6b14cda5d084845103ef5faebf1099f4e04f658f.zip | |
Re-enable SSL download test on QtWebEngine
Diffstat (limited to 'tests/end2end')
| -rw-r--r-- | tests/end2end/features/conftest.py | 9 | ||||
| -rw-r--r-- | tests/end2end/features/downloads.feature | 3 | ||||
| -rw-r--r-- | tests/end2end/features/test_prompts_bdd.py | 9 |
3 files changed, 10 insertions, 11 deletions
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py index 9b7a9e2d5..dea0e9a83 100644 --- a/tests/end2end/features/conftest.py +++ b/tests/end2end/features/conftest.py @@ -352,6 +352,15 @@ def javascript_message_when(quteproc, message): quteproc.wait_for_js(message) +@bdd.when("I clear SSL errors") +def clear_ssl_errors(request, quteproc): + if request.config.webengine: + quteproc.terminate() + quteproc.start() + else: + quteproc.send_cmd(':debug-clear-ssl-errors') + + ## Then diff --git a/tests/end2end/features/downloads.feature b/tests/end2end/features/downloads.feature index f187a7336..1e1e59b34 100644 --- a/tests/end2end/features/downloads.feature +++ b/tests/end2end/features/downloads.feature @@ -75,9 +75,8 @@ Feature: Downloading things from a website. And I run :leave-mode Then no crash should happen - @qtwebengine_todo: ssl-strict is not implemented yet Scenario: Downloading with SSL errors (issue 1413) - When I run :debug-clear-ssl-errors + When I clear SSL errors And I set network -> ssl-strict to ask And I download an SSL page And I wait for "Entering mode KeyMode.* (reason: question asked)" in the log diff --git a/tests/end2end/features/test_prompts_bdd.py b/tests/end2end/features/test_prompts_bdd.py index 83e03f721..3ebd53e8c 100644 --- a/tests/end2end/features/test_prompts_bdd.py +++ b/tests/end2end/features/test_prompts_bdd.py @@ -21,15 +21,6 @@ import pytest_bdd as bdd bdd.scenarios('prompts.feature') -@bdd.when("I clear SSL errors") -def clear_ssl_errors(request, quteproc): - if request.config.webengine: - quteproc.terminate() - quteproc.start() - else: - quteproc.send_cmd(':debug-clear-ssl-errors') - - @bdd.when("I load an SSL page") def load_ssl_page(quteproc, ssl_server): # We don't wait here as we can get an SSL question. |