Merge remote-tracking branch 'origin/master' into 4nd3r/hostblock_subdomains

2 files changed, 20 insertions, 1 deletions

diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py
index 28c52a1e0..3e1d15099 100644
--- a/tests/unit/config/test_configtypes.py
+++ b/tests/unit/config/test_configtypes.py
@@ -2117,6 +2117,24 @@ class TestUrlPattern:
             klass().to_py('http://')
 
 
+class TestStatusbarWidget:
+
+    @pytest.fixture
+    def klass(self):
+        return configtypes.StatusbarWidget
+
+    @pytest.mark.parametrize('value', ['text:bar', 'foo'])
+    def test_validate_valid_values(self, klass, value):
+        widget = klass(valid_values=configtypes.ValidValues('foo'))
+        assert widget.to_py(value) == value
+
+    @pytest.mark.parametrize('value', ['text', 'foo:bar'])
+    def test_validate_invalid_values(self, klass, value):
+        widget = klass(valid_values=configtypes.ValidValues('foo'))
+        with pytest.raises(configexc.ValidationError):
+            widget.to_py(value)
+
+
 @pytest.mark.parametrize('first, second, equal', [
     (re.compile('foo'), RegexEq('foo'), True),
     (RegexEq('bar'), re.compile('bar'), True),
diff --git a/tests/unit/javascript/test_js_quirks.py b/tests/unit/javascript/test_js_quirks.py
index b906aa17c..7036dcfc9 100644
--- a/tests/unit/javascript/test_js_quirks.py
+++ b/tests/unit/javascript/test_js_quirks.py
@@ -62,7 +62,8 @@ from qutebrowser.utils import usertypes
         id='object-fromentries',
     ),
 ])
-def test_js_quirks(js_tester_webengine, base_url, source, expected):
+def test_js_quirks(config_stub, js_tester_webengine, base_url, source, expected):
+    config_stub.val.content.site_specific_quirks.skip = []
     js_tester_webengine.tab._scripts._inject_site_specific_quirks()
     js_tester_webengine.load('base.html', base_url=base_url)
     js_tester_webengine.run(source, expected, world=usertypes.JsWorld.main)