From 0907d8bf762b73f079f9c034e779e9a82d5f2ef7 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 23 Aug 2015 18:17:22 +0200 Subject: [PATCH] tests: Add a webview fixture. --- tests/conftest.py | 15 +++++++++++++++ tests/unit/javascript/conftest.py | 13 ++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index f91c90295..c67ccf912 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -216,6 +216,21 @@ def webpage(qnam): return page +@pytest.fixture +def webview(qtbot, webpage): + """Get a new QWebView object.""" + from PyQt5.QtWebKitWidgets import QWebView + + view = QWebView() + qtbot.add_widget(view) + + view.page().deleteLater() + view.setPage(webpage) + + view.resize(640, 480) + return view + + @pytest.fixture def webframe(webpage): """Convenience fixture to get a mainFrame of a QWebPage.""" diff --git a/tests/unit/javascript/conftest.py b/tests/unit/javascript/conftest.py index 3bc65aff1..294da5d49 100644 --- a/tests/unit/javascript/conftest.py +++ b/tests/unit/javascript/conftest.py @@ -125,15 +125,6 @@ class JSTester: @pytest.fixture -def js_tester(qtbot): - """Fixture to test javascript snippets. - - Provides a QWebView with a 640x480px size and a JSTester instance. - - Args: - qtbot: pytestqt.plugin.QtBot fixture. - """ - webview = QWebView() - qtbot.add_widget(webview) - webview.resize(640, 480) +def js_tester(webview, qtbot): + """Fixture to test javascript snippets.""" return JSTester(webview, qtbot)