diff options
| author | Florian Bruhin <git@the-compiler.org> | 2016-06-09 13:01:50 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2016-06-09 17:44:04 +0200 |
| commit | 75669dd21b481143dadc7d7f1ae843126f816eda (patch) | |
| tree | 6e3422bd16c64b60ad5eb419798ca123bf04be0d | |
| parent | ef2b3cd6d955345220ee8ec478f1e4cfddc1df6e (diff) | |
| download | qutebrowser-75669dd21b481143dadc7d7f1ae843126f816eda.tar.gz qutebrowser-75669dd21b481143dadc7d7f1ae843126f816eda.zip | |
tests: Move fake_save_manager to helper.fixtures
| -rw-r--r-- | tests/helpers/fixtures.py | 10 | ||||
| -rw-r--r-- | tests/unit/browser/test_cookies.py | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py index 9e3ba82b3..93d270998 100644 --- a/tests/helpers/fixtures.py +++ b/tests/helpers/fixtures.py @@ -36,6 +36,7 @@ import helpers.stubs as stubsmod from qutebrowser.config import config from qutebrowser.utils import objreg from qutebrowser.browser import cookies +from qutebrowser.misc import savemanager from PyQt5.QtCore import QEvent, QSize, Qt from PyQt5.QtGui import QKeyEvent @@ -303,3 +304,12 @@ def py_proc(): return (sys.executable, ['-c', textwrap.dedent(code.strip('\n'))]) return func + + +@pytest.yield_fixture +def fake_save_manager(): + """Create a mock of save-manager and register it into objreg.""" + fake_save_manager = unittest.mock.Mock(spec=savemanager.SaveManager) + objreg.register('save-manager', fake_save_manager) + yield + objreg.delete('save-manager') diff --git a/tests/unit/browser/test_cookies.py b/tests/unit/browser/test_cookies.py index 9ff4148e2..9e79c657b 100644 --- a/tests/unit/browser/test_cookies.py +++ b/tests/unit/browser/test_cookies.py @@ -27,7 +27,7 @@ import pytest from qutebrowser.browser import cookies from qutebrowser.utils import objreg -from qutebrowser.misc import lineparser, savemanager +from qutebrowser.misc import lineparser CONFIG_ALL_COOKIES = {'content': {'cookies-accept': 'all'}} CONFIG_NEVER_COOKIES = {'content': {'cookies-accept': 'never'}} @@ -67,15 +67,6 @@ class LineparserSaveStub(lineparser.BaseLineParser): return self.data[key] -@pytest.yield_fixture -def fake_save_manager(): - """Create a mock of save-manager and register it into objreg.""" - fake_save_manager = mock.Mock(spec=savemanager.SaveManager) - objreg.register('save-manager', fake_save_manager) - yield - objreg.delete('save-manager') - - def test_set_cookies_accept(config_stub, qtbot, monkeypatch): """Test setCookiesFromUrl with cookies enabled.""" config_stub.data = CONFIG_ALL_COOKIES |