From 184e0ee44e74ca99ac72fb2a036f655762ef25b3 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 25 Feb 2019 09:57:17 +0100 Subject: Rename force_document_end to needs_document_end_workaround --- qutebrowser/browser/greasemonkey.py | 2 +- qutebrowser/browser/webengine/webenginetab.py | 2 +- tests/unit/browser/webengine/test_webenginetab.py | 4 ++-- tests/unit/javascript/test_greasemonkey.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py index 07fa8d581..3a5b60544 100644 --- a/qutebrowser/browser/greasemonkey.py +++ b/qutebrowser/browser/greasemonkey.py @@ -117,7 +117,7 @@ class GreasemonkeyScript: script.includes = ['*'] return script - def force_document_end(self): + def needs_document_end_workaround(self): """Check whether to force @run-at document-end. This needs to be done on QtWebEngine with Qt 5.12 for known-broken diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 41081abb8..9ecdb1955 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -1042,7 +1042,7 @@ class _WebEngineScripts(QObject): # Override the @run-at value parsed by QWebEngineScript if desired. if injection_point: new_script.setInjectionPoint(injection_point) - elif script.force_document_end(): + elif script.needs_document_end_workaround(): log.greasemonkey.debug("Forcing @run-at document-end for {}" .format(script.name)) new_script.setInjectionPoint(QWebEngineScript.DocumentReady) diff --git a/tests/unit/browser/webengine/test_webenginetab.py b/tests/unit/browser/webengine/test_webenginetab.py index 79ac8d37a..380bb8641 100644 --- a/tests/unit/browser/webengine/test_webenginetab.py +++ b/tests/unit/browser/webengine/test_webenginetab.py @@ -94,8 +94,8 @@ class TestWebengineScripts: collection = webengine_scripts._widget.page().scripts() assert collection.toList()[-1].worldId() == worldid - def test_greasemonkey_force_document_end(self, monkeypatch, - webengine_scripts): + def test_greasemonkey_document_end_workaround(self, monkeypatch, + webengine_scripts): """Make sure document-end is forced when needed.""" monkeypatch.setattr(greasemonkey.objects, 'backend', usertypes.Backend.QtWebEngine) diff --git a/tests/unit/javascript/test_greasemonkey.py b/tests/unit/javascript/test_greasemonkey.py index 48d2e075c..12244db4e 100644 --- a/tests/unit/javascript/test_greasemonkey.py +++ b/tests/unit/javascript/test_greasemonkey.py @@ -201,7 +201,7 @@ class TestForceDocumentEnd: patch(backend=backend, qt_512=qt_512) script = self._get_script(namespace='https://github.com/ParticleCore', name='Iridium') - assert not script.force_document_end() + assert not script.needs_document_end_workaround() @pytest.mark.parametrize('namespace, name, force', [ ('http://userstyles.org', 'foobar', True), @@ -213,7 +213,7 @@ class TestForceDocumentEnd: """Test matching based on namespace/name.""" patch(backend=usertypes.Backend.QtWebEngine, qt_512=True) script = self._get_script(namespace=namespace, name=name) - assert script.force_document_end() == force + assert script.needs_document_end_workaround() == force def test_required_scripts_are_included(download_stub, tmpdir): -- cgit v1.2.3-54-g00ecf