caret: Fix toggling behavior with QtWebEngine

The behavior when pressing `v` in line selection mode was different between
QtWebKit and QtWebEngine: With QtWebKit, normal selection mode was entered,
while with QtWebEngine, selection mode was left.

Do the former with QtWebEngine as well, as that's also what vim does.

2 files changed, 17 insertions, 2 deletions

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index e2063a2d4..2d0bced84 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -1452,7 +1452,7 @@ window._qutebrowser.caret = (function() {
                 CaretBrowsing.SelectionState.LINE;
             CaretBrowsing.selectLine();
             CaretBrowsing.finishMove();
-        } else if (CaretBrowsing.selectionState === CaretBrowsing.SelectionState.NONE) {
+        } else if (CaretBrowsing.selectionState !== CaretBrowsing.SelectionState.NORMAL) {
             CaretBrowsing.selectionState = CaretBrowsing.SelectionState.NORMAL;
         } else {
             CaretBrowsing.selectionState = CaretBrowsing.SelectionState.NONE;
diff --git a/tests/unit/browser/test_caret.py b/tests/unit/browser/test_caret.py
index 830dda0ff..7d1325612 100644
--- a/tests/unit/browser/test_caret.py
+++ b/tests/unit/browser/test_caret.py
@@ -25,6 +25,7 @@ import pytest
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.utils import usertypes
+from qutebrowser.browser import browsertab
 
 
 @pytest.fixture
@@ -75,8 +76,10 @@ class Selection:
         self.check(textwrap.dedent(expected).strip(), strip=strip)
 
     def toggle(self, *, line=False):
-        with self._qtbot.wait_signal(self._caret.selection_toggled):
+        """Toggle the selection and return the new selection state."""
+        with self._qtbot.wait_signal(self._caret.selection_toggled) as blocker:
             self._caret.toggle_selection(line=line)
+        return blocker.args[0]
 
 
 @pytest.fixture
@@ -84,6 +87,18 @@ def selection(qtbot, caret):
     return Selection(qtbot, caret)
 
 
+def test_toggle(caret, selection, qtbot):
+    """Make sure calling toggleSelection produces the correct callback values.
+
+    This also makes sure that the SelectionState enum in JS lines up with the
+    Python browsertab.SelectionState enum.
+    """
+    assert selection.toggle() == browsertab.SelectionState.normal
+    assert selection.toggle(line=True) == browsertab.SelectionState.line
+    assert selection.toggle() == browsertab.SelectionState.normal
+    assert selection.toggle() == browsertab.SelectionState.none
+
+
 class TestDocument:
 
     def test_selecting_entire_document(self, caret, selection):