Stabilize "Jumping back after searching" test

The test was flaky because waiting for scrolling didn't actually wait,
as the page logged a scroll position change to 0/0 directly after
loading.

We work around this by making the generic "And I wait until the scroll
position changed" not wait when it changed to 0/0.
This commit is contained in:
Florian Bruhin 2016-09-12 18:53:56 +02:00
parent 14de9f58b8
commit c40325b510
4 changed files with 2 additions and 5 deletions

View File

@ -91,8 +91,6 @@ Feature: Setting positional marks
And I wait until the scroll position changed to 0/0
Then the page should be scrolled to 0 0
# https://ci.appveyor.com/project/The-Compiler/qutebrowser/build/master-3935/job/fc0b1gow5co08c2x
@qtwebengine_flaky
Scenario: Jumping back after searching
When I run :scroll-px 20 15
And I wait until the scroll position changed to 20/15

View File

@ -600,7 +600,7 @@ Feature: Various utility commands.
And I wait until the scroll position changed
And I run :prompt-accept
And I run :repeat-command with count 2
And I wait until the scroll position changed
And I wait until the scroll position changed to 0/0
Then the page should not be scrolled
And the error "prompt-accept: This command is only allowed in prompt/yesno mode." should be shown

View File

@ -286,7 +286,6 @@ Feature: Scrolling
Scenario: :scroll-page with --bottom-navigate and zoom
When I run :zoom 200
And I wait until the scroll position changed
And I run :scroll-perc 100
And I wait until the scroll position changed
And I run :scroll-page --bottom-navigate next 0 1

View File

@ -325,7 +325,7 @@ class QuteProc(testprocess.Process):
# Qt < 5.7
pytest.skip("QWebEnginePage.scrollPositionChanged missing")
if x is None and y is None:
point = '*'
point = 'PyQt5.QtCore.QPoint(*, *)' # not counting 0/0 here
elif x == '0' and y == '0':
point = 'PyQt5.QtCore.QPoint()'
else: