summaryrefslogtreecommitdiff
path: root/tests/unit/config/test_configcommands.py
diff options
context:
space:
mode:
authorJan-Pieter Baert <jan-pieter@baert.jp.net>2020-10-10 17:55:04 +0200
committerJan-Pieter Baert <jan-pieter@baert.jp.net>2020-10-10 17:55:04 +0200
commit6c8eb2dd779d51b7ef69f33f20571dab0be2b8fe (patch)
treeea03a2ce04c915db8b6d227f07f53220df5d5fe5 /tests/unit/config/test_configcommands.py
parentaf3129441126bd0f31bee5a1357cd8a178912f33 (diff)
downloadqutebrowser-6c8eb2dd779d51b7ef69f33f20571dab0be2b8fe.tar.gz
qutebrowser-6c8eb2dd779d51b7ef69f33f20571dab0be2b8fe.zip
Fix configcommands tests
Diffstat (limited to 'tests/unit/config/test_configcommands.py')
-rw-r--r--tests/unit/config/test_configcommands.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 5718f6dc9..2edbea263 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -499,7 +499,7 @@ class TestSource:
else:
assert False, location
- pyfile.write_text('c.content.javascript.enabled = False\n',
+ pyfile.write_text('config.load_autoconfig(False)\nc.content.javascript.enabled = False\n',
encoding='utf-8')
commands.config_source(arg, clear=clear)
@@ -511,14 +511,14 @@ class TestSource:
def test_config_py_arg_source(self, commands, config_py_arg, config_stub):
assert config_stub.val.content.javascript.enabled
- config_py_arg.write_text('c.content.javascript.enabled = False\n',
+ config_py_arg.write_text('config.load_autoconfig(False)\nc.content.javascript.enabled = False\n',
encoding='utf-8')
commands.config_source()
assert not config_stub.val.content.javascript.enabled
def test_errors(self, commands, config_tmpdir):
pyfile = config_tmpdir / 'config.py'
- pyfile.write_text('c.foo = 42', encoding='utf-8')
+ pyfile.write_text('config.load_autoconfig(False)\nc.foo = 42', encoding='utf-8')
with pytest.raises(cmdutils.CommandError) as excinfo:
commands.config_source()
@@ -529,7 +529,7 @@ class TestSource:
def test_invalid_source(self, commands, config_tmpdir):
pyfile = config_tmpdir / 'config.py'
- pyfile.write_text('1/0', encoding='utf-8')
+ pyfile.write_text('config.load_autoconfig(False)\n1/0', encoding='utf-8')
with pytest.raises(cmdutils.CommandError) as excinfo:
commands.config_source()
@@ -571,7 +571,7 @@ class TestEdit:
def test_with_sourcing(self, commands, config_stub, patch_editor):
assert config_stub.val.content.javascript.enabled
- mock = patch_editor('c.content.javascript.enabled = False')
+ mock = patch_editor('config.load_autoconfig(False)\nc.content.javascript.enabled = False')
commands.config_edit()
@@ -580,16 +580,16 @@ class TestEdit:
def test_config_py_with_sourcing(self, commands, config_stub, patch_editor, config_py_arg):
assert config_stub.val.content.javascript.enabled
- conf = 'c.content.javascript.enabled = False'
- mock = patch_editor(conf)
+ conf = ['config.load_autoconfig(False)','c.content.javascript.enabled = False']
+ mock = patch_editor("\n".join(conf))
commands.config_edit()
mock.assert_called_once_with(unittest.mock.ANY)
assert not config_stub.val.content.javascript.enabled
- assert config_py_arg.read_text('utf-8').splitlines() == [conf]
+ assert config_py_arg.read_text('utf-8').splitlines() == conf
def test_error(self, commands, config_stub, patch_editor, message_mock,
caplog):
- patch_editor('c.foo = 42')
+ patch_editor('config.load_autoconfig(False)\nc.foo = 42')
with caplog.at_level(logging.ERROR):
commands.config_edit()