A few cmdhistory tests

qutebrowser/misc/cmdhistory.py

@@ -63,9 +63,9 @@ class History(QObject):
         super().__init__(parent)
         self.handle_private_mode = False
         self._tmphist = None
-        if history is None:
+
-            self.history = []
+        self.history = []
-        else:
+        if history:
             self.history = history
 
     def __getitem__(self, idx):

qutebrowser/utils/usertypes.py

@@ -53,7 +53,7 @@ def enum(name, items, start=1, is_int=False):
 
 class NeighborList(collections.abc.Sequence):
 
-    """A list of items which saves it current position.
+    """A list of items which saves its current position.
 
     Class attributes:
         Modes: Different modes, see constructor documentation.

tests/unit/misc/test_cmdhistory.py

@@ -0,0 +1,94 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2015 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>:
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for misc.History."""
+
+import pytest
+
+from qutebrowser.misc.cmdhistory import History
+
+
+HISTORY = ['first', 'second', 'third', 'fourth', 'fifth']
+
+
+class TestConstructor:
+
+    """Tests for the constructor."""
+
+    def test_no_history(self):
+        hist = History()
+        # .history should equal []
+        assert len(hist.history) == 0
+
+    def test_history(self):
+        hist = History(history=HISTORY)
+        assert hist.history == HISTORY
+
+
+class TestCommandHistory:
+
+    """Create a setup for inheritance"""
+
+    @pytest.fixture(autouse=True)
+    def setup(self):
+        self.hist = History(history=HISTORY)
+
+
+class TestBrowsing(TestCommandHistory):
+
+    """Tests for the history browsing."""
+
+    def test_append_private_mode(self, monkeypatch):
+        """Test append in private mode."""
+        self.hist.handle_private_mode = True
+        # We want general.private-browsing set to True
+        monkeypatch.setattr('qutebrowser.config.config.get',
+                            lambda s1, s2: True)
+        self.hist.append('new item')
+        assert self.hist.history == HISTORY
+
+    def test_append(self, monkeypatch):
+        """Test append outside private mode."""
+
+        # Private mode is disabled (general.private-browsing is set to False)
+        monkeypatch.setattr('qutebrowser.config.config.get',
+                            lambda s1, s2: False)
+        self.hist.append('new item')
+        assert 'new item' in self.hist.history
+        self.hist.history.remove('new item')
+        assert self.hist.history == HISTORY
+
+    def test_is_browsing(self):
+        """Test is_browsing()."""
+
+        self.hist._tmphist = None
+        assert not self.hist.is_browsing()
+
+        self.hist._tmphist = HISTORY
+        assert self.hist.is_browsing()
+
+    def test_start_stop_is_browsing(self):
+        """Test the start/stop."""
+
+        # We can use is_browsing() because it is tested above
+        assert not self.hist.is_browsing()
+        self.hist.start('s')
+        assert self.hist.is_browsing()
+        self.hist.stop()
+        assert not self.hist.is_browsing()