From 38a26a7ff8d153b6b1b457b9d788e605fe42ce7d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Wed, 22 Jun 2022 12:00:46 +0200
Subject: Correctly set initial content.default_encoding

This is handled separately from the other settings, but were never initialized
properly in init_settings().

This has been around since 2018: 3956f81e730463adcba05d92d0043155609aa422.

For content.javascript.clipboard, this is a recent regression introduced in
4a6df3a8e84780e9f58dbda31c3a9bfa1e35cebe. Thus, that part wasn't cherry-picked.

Fixes #7281

(cherry picked from commit dd68a84bc94da0492e3e49eaea629e604fe8ebee)
---
 qutebrowser/browser/webengine/webenginesettings.py |  1 +
 qutebrowser/config/websettings.py                  |  2 +
 .../browser/webengine/test_webenginesettings.py    | 58 +++++++++++++++++++++-
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 5430cec77..406825900 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -218,6 +218,7 @@ class WebEngineSettings(websettings.AbstractSettings):
     def _update_setting(self, setting, value):
         if setting == 'content.unknown_url_scheme_policy':
             return self.set_unknown_url_scheme_policy(value)
+        # NOTE: When adding something here, also add it to init_settings()!
         return super()._update_setting(setting, value)
 
     def init_settings(self):
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 41aeec6a3..e9f1fcf4d 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -180,6 +180,7 @@ class AbstractSettings:
             self.set_font_family(setting, value)
         elif setting == 'content.default_encoding':
             self.set_default_text_encoding(value)
+        # NOTE: When adding something here, also add it to init_settings()!
         return False
 
     def update_setting(self, setting: str) -> None:
@@ -202,6 +203,7 @@ class AbstractSettings:
         for setting in (list(self._ATTRIBUTES) + list(self._FONT_SIZES) +
                         list(self._FONT_FAMILIES)):
             self.update_setting(setting)
+        self.update_setting('content.default_encoding')
 
 
 @debugcachestats.register(name='user agent cache')
diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py
index 0f803a172..99438c849 100644
--- a/tests/unit/browser/webengine/test_webenginesettings.py
+++ b/tests/unit/browser/webengine/test_webenginesettings.py
@@ -22,15 +22,20 @@ import logging
 import pytest
 
 QtWebEngineWidgets = pytest.importorskip('PyQt5.QtWebEngineWidgets')
+QWebEngineSettings = QtWebEngineWidgets.QWebEngineSettings
 
 from qutebrowser.browser.webengine import webenginesettings
 from qutebrowser.utils import usertypes
 
 
 @pytest.fixture
-def global_settings(monkeypatch, default_profile):
+def settings(default_profile):
     wrapper = webenginesettings._SettingsWrapper()
-    settings = webenginesettings.WebEngineSettings(wrapper)
+    return webenginesettings.WebEngineSettings(wrapper)
+
+
+@pytest.fixture
+def global_settings(monkeypatch, settings):
     settings.init_settings()
     monkeypatch.setattr(webenginesettings, '_global_settings', settings)
 
@@ -57,6 +62,55 @@ def private_profile(monkeypatch):
     return profile
 
 
+@pytest.mark.parametrize("setting, value, getter, expected", [
+    # attribute
+    (
+        "content.images", False,
+        lambda settings:
+            settings.testAttribute(QWebEngineSettings.WebAttribute.AutoLoadImages),
+        False,
+    ),
+    # font size
+    (
+        "fonts.web.size.default", 23,
+        lambda settings:
+            settings.fontSize(QWebEngineSettings.FontSize.DefaultFontSize),
+        23,
+    ),
+    # font family
+    (
+        "fonts.web.family.standard", "Comic Sans MS",
+        lambda settings:
+            settings.fontFamily(QWebEngineSettings.FontFamily.StandardFont),
+        "Comic Sans MS",
+    ),
+    # encoding
+    (
+        "content.default_encoding", "utf-16",
+        lambda settings: settings.defaultTextEncoding(),
+        "utf-16",
+    ),
+    # unknown URL scheme policy
+    (
+        "content.unknown_url_scheme_policy", "allow-all",
+        lambda settings: settings.unknownUrlSchemePolicy(),
+        QWebEngineSettings.UnknownUrlSchemePolicy.AllowAllUnknownUrlSchemes,
+    ),
+])
+def test_initial_settings(settings, config_stub, default_profile,
+                          setting, value, getter, expected):
+    """Make sure initial setting values are applied correctly."""
+    qt_settings = default_profile.settings()
+    initial = getter(qt_settings)
+    assert initial != expected  # no point in testing for the Qt default
+
+    config_stub.set_obj(setting, value)
+    settings.init_settings()
+
+    actual = getter(qt_settings)
+    assert actual == expected
+
+
 def test_big_cache_size(config_stub, default_profile):
     """Make sure a too big cache size is handled correctly."""
     config_stub.val.content.cache.size = 2 ** 63 - 1
-- 
cgit v1.2.3-54-g00ecf