From 81851394164d978ffd30a394203d36924d729c2c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 6 Oct 2018 12:20:20 +0200 Subject: [PATCH] Simplify :jseval tests The @qt<5.11.2 mark in Qt also checks for the PyQt version, which causes this tests to fail with a new Qt but old PyQt. --- tests/end2end/features/misc.feature | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature index 6893e143a..a8e81b7b5 100644 --- a/tests/end2end/features/misc.feature +++ b/tests/end2end/features/misc.feature @@ -118,25 +118,15 @@ Feature: Various utility commands. Then the javascript message "Hello from the page!" should be logged And "No output or error" should be logged - @qtwebkit_skip @qt>=5.11.2 - Scenario: :jseval using too high of a world id in Qt versions bigger than 5.11.2 + @qtwebkit_skip + Scenario: :jseval using too high of a world When I run :jseval --world=257 console.log("Hello from JS!"); - Then the error "World ID should be between 0 and 256" should be shown + Then the error "World ID should be between 0 and *" should be shown - @qtwebkit_skip @qt<5.11.2 - Scenario: :jseval using too high of a world id in Qt versions smaller than 5.11.2 - When I run :jseval --world=12 console.log("Hello from JS!"); - Then the error "World ID should be between 0 and 11" should be shown - - @qtwebkit_skip @qt>=5.11.2 - Scenario: :jseval using a negative world id in Qt versions bigger than 5.11.2 + @qtwebkit_skip + Scenario: :jseval using a negative world id When I run :jseval --world=-1 console.log("Hello from JS!"); - Then the error "World ID should be between 0 and 256" should be shown - - @qtwebkit_skip @qt<5.11.2 - Scenario: :jseval using a negative world id in Qt versions smaller than 5.11.2 - When I run :jseval --world=-1 console.log("Hello from JS!"); - Then the error "World ID should be between 0 and 11" should be shown + Then the error "World ID should be between 0 and *" should be shown Scenario: :jseval --file using a file that exists as js-code When I run :jseval --file (testdata)/misc/jseval_file.js