Merge branch 'HolySmoke86-issue1988'

This commit is contained in:
Florian Bruhin 2016-09-29 10:59:32 +02:00
commit 80b5c9127e
2 changed files with 6 additions and 2 deletions

View File

@ -168,13 +168,13 @@ Contributors, sorted by the number of commits in descending order:
* Austin Anderson
* Jimmy
* Niklas Haas
* Daniel Karbach
* Alexey "Averrin" Nabrodov
* nanjekyejoannah
* avk
* ZDarian
* Milan Svoboda
* John ShaggyTwoDope Jenkins
* Daniel Karbach
* Clayton Craft
* Peter Vilim
* knaggita

View File

@ -67,7 +67,11 @@ class CaretTester:
@pytest.fixture
def caret_tester(js_tester):
"""Helper fixture to test caret browsing positions."""
return CaretTester(js_tester)
caret_tester = CaretTester(js_tester)
# Showing webview here is necessary for test_scrolled_down_img to
# succeed in some cases, see #1988
caret_tester.js.webview.show()
return caret_tester
@pytest.mark.integration