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

Share setup between webkit_tab and webengine_tab

Browse Source
This commit is contained in:
Florian Bruhin 2018-09-14 23:38:29 +02:00
parent d74daf9294
commit 9edbcfb828
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/helpers/fixtures.py
View File

@ -182,9 +182,10 @@ def testdata_scheme(qapp):
@pytest.fixture @pytest.fixture
def webkit_tab(qtbot, tab_registry, cookiejar_and_cache, mode_manager, def web_tab_setup(qtbot, tab_registry, session_manager_stub,
session_manager_stub, greasemonkey_manager, fake_args, greasemonkey_manager, fake_args, host_blocker_stub,
host_blocker_stub, config_stub, testdata_scheme): config_stub, testdata_scheme):
"""Shared setup for webkit_tab/webengine_tab."""
# Make sure error logging via JS fails tests # Make sure error logging via JS fails tests
config_stub.val.content.javascript.log = { config_stub.val.content.javascript.log = {
'info': 'info', 'info': 'info',
@ -193,6 +194,9 @@ def webkit_tab(qtbot, tab_registry, cookiejar_and_cache, mode_manager,
'warning': 'error', 'warning': 'error',
} }
@pytest.fixture
def webkit_tab(web_tab_setup, qtbot, cookiejar_and_cache, mode_manager):
webkittab = pytest.importorskip('qutebrowser.browser.webkit.webkittab') webkittab = pytest.importorskip('qutebrowser.browser.webkit.webkittab')
container = QWidget() container = QWidget()
@ -212,18 +216,8 @@ def webkit_tab(qtbot, tab_registry, cookiejar_and_cache, mode_manager,
@pytest.fixture @pytest.fixture
def webengine_tab(qtbot, tab_registry, fake_args, mode_manager, def webengine_tab(web_tab_setup, qtbot, redirect_webengine_data,
session_manager_stub, greasemonkey_manager, tabbed_browser_stubs, mode_manager):
redirect_webengine_data, tabbed_browser_stubs,
config_stub, qapp, testdata_scheme):
# Make sure error logging via JS fails tests
config_stub.val.content.javascript.log = {
'info': 'info',
'error': 'error',
'unknown': 'error',
'warning': 'error',
}
tabwidget = tabbed_browser_stubs[0].widget tabwidget = tabbed_browser_stubs[0].widget
tabwidget.current_index = 0 tabwidget.current_index = 0
tabwidget.index_of = 0 tabwidget.index_of = 0