Remove default_config fixture

tests/helpers/fixtures.py

@@ -228,13 +228,6 @@ def config_stub(stubs, monkeypatch, configdata_init):
     return conf
 
 
-@pytest.fixture
-def default_config():
-    """Fixture that provides and registers an empty default config object."""
-    # FIXME:conf
-    return None
-
-
 @pytest.fixture
 def key_config_stub(config_stub, monkeypatch):
     """Fixture which provides a fake key config object."""

tests/unit/browser/test_tab.py

@@ -49,7 +49,7 @@ def view(qtbot, config_stub, request):
 
 
 @pytest.fixture(params=['webkit', 'webengine'])
-def tab(request, default_config, qtbot, tab_registry, cookiejar_and_cache):
+def tab(request, qtbot, tab_registry, cookiejar_and_cache, mode_manager):
     if PYQT_VERSION < 0x050600:
         pytest.skip('Causes segfaults, see #1638')
 
@@ -63,17 +63,10 @@ def tab(request, default_config, qtbot, tab_registry, cookiejar_and_cache):
     else:
         assert False
 
-    # Can't use the mode_manager fixture as that uses config_stub, which
-    # conflicts with default_config
-    mm = modeman.ModeManager(0)
-    objreg.register('mode-manager', mm, scope='window', window=0)
-
-    t = tab_class(win_id=0, mode_manager=mm)
+    t = tab_class(win_id=0, mode_manager=mode_manager)
     qtbot.add_widget(t)
     yield t
 
-    objreg.delete('mode-manager', scope='window', window=0)
-
 
 class Zoom(browsertab.AbstractZoom):