Fix state config unit tests

1 files changed, 28 insertions, 13 deletions

diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index f48c17f1c..140813990 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -81,6 +81,7 @@ def autoconfig(config_tmpdir):
      False,
      '[general]\n'
      'qt_version = 5.6.7\n'
+     'qtwe_version = 7.8.9\n'
      'version = 1.2.3\n'
      '\n'
      '[geometry]\n'
@@ -92,6 +93,7 @@ def autoconfig(config_tmpdir):
      False,
      '[general]\n'
      'qt_version = 5.6.7\n'
+     'qtwe_version = 7.8.9\n'
      'version = 1.2.3\n'
      '\n'
      '[geometry]\n'
@@ -104,6 +106,7 @@ def autoconfig(config_tmpdir):
      '[general]\n'
      'foobar = 42\n'
      'qt_version = 5.6.7\n'
+     'qtwe_version = 7.8.9\n'
      'version = 1.2.3\n'
      '\n'
      '[geometry]\n'
@@ -114,6 +117,7 @@ def autoconfig(config_tmpdir):
      True,
      '[general]\n'
      'qt_version = 5.6.7\n'
+     'qtwe_version = 7.8.9\n'
      'version = 1.2.3\n'
      'newval = 23\n'
      '\n'
@@ -122,10 +126,13 @@ def autoconfig(config_tmpdir):
      '[inspector]\n'
      '\n'),
 ])
-def test_state_config(fake_save_manager, data_tmpdir, monkeypatch,
-                      old_data, insert, new_data):
+def test_state_config(
+    fake_save_manager, data_tmpdir, monkeypatch, qtwe_version_patcher,
+    old_data, insert, new_data
+):
     monkeypatch.setattr(configfiles.qutebrowser, '__version__', '1.2.3')
     monkeypatch.setattr(configfiles, 'qVersion', lambda: '5.6.7')
+    qtwe_version_patcher('7.8.9')
 
     statefile = data_tmpdir / 'state'
     if old_data is not None:
@@ -157,6 +164,23 @@ def state_writer(data_tmpdir):
     return _write
 
 
+@pytest.fixture
+def qtwe_version_patcher(monkeypatch):
+    def patch(ver):
+        monkeypatch.setattr(
+            configfiles.version,
+            'qtwebengine_versions',
+            lambda avoid_init=False:
+                version.WebEngineVersions(
+                    webengine=utils.VersionNumber.parse(ver),
+                    chromium=None,
+                    source='test',
+                )
+        )
+
+    return patch
+
+
 @pytest.mark.parametrize('old_version, new_version, changed', [
     (None, '5.12.1', False),
     ('5.12.1', '5.12.1', False),
@@ -182,18 +206,9 @@ def test_qt_version_changed(state_writer, monkeypatch,
     ('5.15.1', '5.15.2', True),
     ('5.14.0', '5.15.2', True),
 ])
-def test_qtwe_version_changed(state_writer, monkeypatch,
+def test_qtwe_version_changed(state_writer, qtwe_version_patcher,
                               old_version, new_version, changed):
-    monkeypatch.setattr(
-        configfiles.version,
-        'qtwebengine_versions',
-        lambda avoid_init=False:
-            version.WebEngineVersions(
-                webengine=utils.VersionNumber.parse(new_version),
-                chromium=None,
-                source='test',
-            )
-    )
+    qtwe_version_patcher(new_version)
 
     if old_version is not None:
         state_writer('qtwe_version', old_version)