From b6d5a5cf14ccdc849d3c94805079a135ee4adc31 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 25 Mar 2025 14:23:48 +0100 Subject: [PATCH] Fix and simplify JS quirks tests --- doc/changelog.asciidoc | 2 +- tests/unit/javascript/test_js_quirks.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 7ef58ee2c..483038110 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -45,7 +45,7 @@ Fixed error is shown instead). - The default user agent now only contains the shortened Chromium version number, which fixes overzealous blocking on ScienceDirect. -- New site-specific quirk to fix existing accounts showing as non-existant on +- New site-specific quirk to fix existing accounts showing as non-existent on Digitec/Galaxus. - Resolved issues in userscripts: * `qute-bitwarden` will now prompt a re-login if its cached session has diff --git a/tests/unit/javascript/test_js_quirks.py b/tests/unit/javascript/test_js_quirks.py index 981f9d9e8..b7760b980 100644 --- a/tests/unit/javascript/test_js_quirks.py +++ b/tests/unit/javascript/test_js_quirks.py @@ -61,17 +61,17 @@ def test_js_quirks_match_files(webengine_tab): def test_js_quirks_match_settings(webengine_tab, configdata_init): + quirks_code = {q.name for q in webengine_tab._scripts._get_quirks()} + opt = configdata.DATA["content.site_specific_quirks.skip"] - prefix = "js-" valid_values = opt.typ.get_valid_values() assert valid_values is not None quirks_config = { - val.removeprefix(prefix).replace("-", "_") + val for val in valid_values - if val.startswith(prefix) + # some JS quirks are actually only setting the user agent, so we include + # those as well. + if val.startswith("js-") or (val.startswith("ua-") and val in quirks_code) } - quirks_code = {q.filename for q in webengine_tab._scripts._get_quirks()} - quirks_code -= {"googledocs"} # special case, UA quirk - assert quirks_code == quirks_config