From bf3579d5b9c6f264e247964a16088b49cca5d068 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 10 Aug 2016 15:19:12 +0200 Subject: [PATCH] Fix test_history for WebKit/WebEngine split --- tests/unit/browser/webkit/test_history.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/unit/browser/webkit/test_history.py b/tests/unit/browser/webkit/test_history.py index 43ef8506d..7a8cd7387 100644 --- a/tests/unit/browser/webkit/test_history.py +++ b/tests/unit/browser/webkit/test_history.py @@ -29,6 +29,7 @@ from PyQt5.QtCore import QUrl from PyQt5.QtWebKit import QWebHistoryInterface from qutebrowser.browser import history +from qutebrowser.browser.webkit import webkithistory from qutebrowser.utils import objreg @@ -371,7 +372,7 @@ def hist_interface(): title='example') history_dict = {'http://www.example.com/': entry} fake_hist = FakeWebHistory(history_dict) - interface = history.WebHistoryInterface(fake_hist) + interface = webkithistory.WebHistoryInterface(fake_hist) QWebHistoryInterface.setDefaultInterface(interface) yield QWebHistoryInterface.setDefaultInterface(None) @@ -385,11 +386,23 @@ def test_history_interface(qtbot, webview, hist_interface): webview.load(url) -def test_init(qapp, tmpdir, monkeypatch, fake_save_manager): +@pytest.mark.parametrize('backend', ['webengine', 'webkit']) +def test_init(backend, qapp, tmpdir, monkeypatch, fake_save_manager, + fake_args): + fake_args.backend = backend monkeypatch.setattr(history.standarddir, 'data', lambda: str(tmpdir)) history.init(qapp) hist = objreg.get('web-history') assert hist.parent() is qapp - assert QWebHistoryInterface.defaultInterface()._history is hist + default_interface = QWebHistoryInterface.defaultInterface() + + if backend == 'webkit': + assert default_interface._history is hist + else: + assert backend == 'webengine' + # For this to work, nothing can ever have called setDefaultInterface + # before (so we need to test webengine before webkit) + assert default_interface is None + assert fake_save_manager.add_saveable.called objreg.delete('web-history')