From 45eece372f27ae5262db54b564d2eaab745fe529 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sat, 8 Sep 2018 15:51:42 +0200
Subject: [PATCH] Don't access caretElement if it's gone

---
 qutebrowser/javascript/caret.js | 14 +++++++++-----
 tests/helpers/fixtures.py       | 16 +++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index d82d7e856..ecb4f97c8 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -1271,14 +1271,18 @@ window._qutebrowser.caret = (function() {
     };
 
     CaretBrowsing.startAnimation = function() {
-        CaretBrowsing.caretElement.style.animationIterationCount = "infinite";
+        if (CaretBrowsing.caretElement) {
+            CaretBrowsing.caretElement.style.animationIterationCount = "infinite";
+        }
     };
 
     CaretBrowsing.stopAnimation = function() {
-        CaretBrowsing.caretElement.style.animationIterationCount = 0;
-        window.setTimeout(() => {
-            CaretBrowsing.startAnimation();
-        }, 1000);
+        if (CaretBrowsing.caretElement) {
+            CaretBrowsing.caretElement.style.animationIterationCount = 0;
+            window.setTimeout(() => {
+                CaretBrowsing.startAnimation();
+            }, 1000);
+        }
     };
 
     CaretBrowsing.init = function() {
diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index ea297f02c..2c8a44df8 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -156,11 +156,12 @@ def greasemonkey_manager(data_tmpdir):
 def webkit_tab(qtbot, tab_registry, cookiejar_and_cache, mode_manager,
                session_manager_stub, greasemonkey_manager, fake_args,
                host_blocker_stub, config_stub):
+    # Make sure error logging via JS fails tests
     config_stub.val.content.javascript.log = {
         'info': 'info',
-        'error': 'info',
-        'unknown': 'info',
-        'warning': 'info'
+        'error': 'error',
+        'unknown': 'error',
+        'warning': 'error',
     }
 
     webkittab = pytest.importorskip('qutebrowser.browser.webkit.webkittab')
@@ -185,12 +186,13 @@ def webkit_tab(qtbot, tab_registry, cookiejar_and_cache, mode_manager,
 def webengine_tab(qtbot, tab_registry, fake_args, mode_manager,
                   session_manager_stub, greasemonkey_manager,
                   redirect_webengine_data, tabbed_browser_stubs,
-                  config_stub):
+                  config_stub, qapp):
+    # Make sure error logging via JS fails tests
     config_stub.val.content.javascript.log = {
         'info': 'info',
-        'error': 'info',
-        'unknown': 'info',
-        'warning': 'info'
+        'error': 'error',
+        'unknown': 'error',
+        'warning': 'error',
     }
 
     tabwidget = tabbed_browser_stubs[0].widget