rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'HolySmoke86-issue1988'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.asciidoc
View File

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

6
tests/unit/javascript/position_caret/test_position_caret.py
View File

@ -67,7 +67,11 @@ class CaretTester:
@pytest.fixture @pytest.fixture
def caret_tester(js_tester): def caret_tester(js_tester):
"""Helper fixture to test caret browsing positions.""" """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 @pytest.mark.integration