Merge branch 'master' into more-sophisticated-adblock

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index f896cf4ad..cb2608145 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -212,6 +212,16 @@ class TestSet:
             commands.set(win_id=0, option='foo?')
 
 
+@pytest.mark.parametrize('old', [True, False])
+def test_diff(commands, tabbed_browser_stubs, old):
+    """Run ':config-diff'.
+
+    Should open qute://configdiff."""
+    commands.config_diff(win_id=0, old=old)
+    url = QUrl('qute://configdiff/old') if old else QUrl('qute://configdiff')
+    assert tabbed_browser_stubs[0].loaded_url == url
+
+
 class TestCycle:
 
     """Test :config-cycle."""
@@ -625,6 +635,19 @@ class TestWritePy:
         lines = confpy.read_text('utf-8').splitlines()
         assert '# Autogenerated config.py' in lines
 
+    @pytest.mark.posix
+    def test_expanduser(self, commands, monkeypatch, tmpdir):
+        """Make sure that using a path with ~/... works correctly."""
+        home = tmpdir / 'home'
+        home.ensure(dir=True)
+        monkeypatch.setenv('HOME', str(home))
+
+        commands.config_write_py('~/config.py')
+
+        confpy = home / 'config.py'
+        lines = confpy.read_text('utf-8').splitlines()
+        assert '# Autogenerated config.py' in lines
+
     def test_existing_file(self, commands, tmpdir):
         confpy = tmpdir / 'config.py'
         confpy.ensure()