From a52c8d6576cfb06f60fc38948da68581ec9244e6 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 5 Sep 2016 14:41:05 +0200 Subject: [PATCH] Clean up javascript double-close test The test for QtWebEngine was removed because something weird happened with the two pytest-bdd tags, and I'm too annoyed with everything being broken to investigate now... Future me, I'm sorry. --- tests/end2end/data/javascript/issue906.html | 22 ------------------- .../end2end/data/javascript/window_open.html | 5 +++++ tests/end2end/features/javascript.feature | 19 +++------------- 3 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 tests/end2end/data/javascript/issue906.html diff --git a/tests/end2end/data/javascript/issue906.html b/tests/end2end/data/javascript/issue906.html deleted file mode 100644 index ec2e0041b..000000000 --- a/tests/end2end/data/javascript/issue906.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - diff --git a/tests/end2end/data/javascript/window_open.html b/tests/end2end/data/javascript/window_open.html index 9e0f2ca8a..af09755e0 100644 --- a/tests/end2end/data/javascript/window_open.html +++ b/tests/end2end/data/javascript/window_open.html @@ -20,6 +20,11 @@ function close() { my_window.close(); } + + function close_twice() { + my_window.close(); + my_window.close(); + } diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature index d7b3b4d89..aad1eee4d 100644 --- a/tests/end2end/features/javascript.feature +++ b/tests/end2end/features/javascript.feature @@ -36,22 +36,9 @@ Feature: Javascript stuff Scenario: Closing a JS window twice (issue 906) - qtwebkit When I open about:blank And I run :tab-only - When I open data/javascript/issue906.html in a new tab - And I run :click-element id open-button + When I open data/javascript/window_open.html in a new tab + And I run :click-element id open-normal And I wait for "Changing title for idx 2 to 'about:blank'" in the log And I run :tab-focus 2 - And I run :click-element id close-button + And I run :click-element id close-twice Then "Requested to close * which does not exist!" should be logged - - @qtwebengine_createWindow @qtwebkit_skip - Scenario: Closing a JS window twice (issue 906) - qtwebengine - When I open about:blank - And I run :tab-only - And I open data/javascript/issue906.html in a new tab - And I run :click-element id open-button - And I wait for "WebDialog requested, but we don't support that!" in the log - And I wait for "Changing title for idx 2 to 'about:blank'" in the log - And I run :tab-focus 2 - And I run :click-element id close-button - And I wait for "Focus object changed: *" in the log - Then no crash should happen