Merge remote-tracking branch 'jdufresne/show-network-errors'

* jdufresne/show-network-errors:
  Display all fetch() errors in ajax()

Author: matthiask

debug_toolbar/static/debug_toolbar/js/utils.js

@@ -36,21 +36,24 @@ const $$ = {
 
 function ajax(url, init) {
     init = Object.assign({ credentials: "same-origin" }, init);
-    return fetch(url, init).then(function (response) {
-        if (response.ok) {
-            return response.json();
-        } else {
+    return fetch(url, init)
+        .then(function (response) {
+            if (response.ok) {
+                return response.json();
+            }
+            return Promise.reject(
+                new Error(response.status + ": " + response.statusText)
+            );
+        })
+        .catch(function (error) {
             const win = document.querySelector("#djDebugWindow");
             win.innerHTML =
                 '<div class="djDebugPanelTitle"><a class="djDebugClose" href="">»</a><h3>' +
-                response.status +
-                ": " +
-                response.statusText +
+                error.message +
                 "</h3></div>";
             $$.show(win);
-            return Promise.reject();
-        }
-    });
+            throw error;
+        });
 }
 
 function ajaxForm(element) {

tests/test_integration.py

@@ -12,6 +12,7 @@
 from django.test.utils import override_settings
 
 from debug_toolbar.middleware import DebugToolbarMiddleware, show_toolbar
+from debug_toolbar.panels import Panel
 from debug_toolbar.toolbar import DebugToolbar
 
 from .base import BaseTestCase, IntegrationTestCase
@@ -31,6 +32,15 @@
 rf = RequestFactory()
 
 
+class BuggyPanel(Panel):
+    def title(self):
+        return "BuggyPanel"
+
+    @property
+    def content(self):
+        raise Exception
+
+
 @override_settings(DEBUG=True)
 class DebugToolbarTestCase(BaseTestCase):
     def test_show_toolbar(self):
@@ -466,3 +476,11 @@ def test_sql_action_and_go_back(self):
 
         # SQL panel is still visible
         self.assertTrue(sql_panel.is_displayed())
+
+    @override_settings(DEBUG_TOOLBAR_PANELS=["tests.test_integration.BuggyPanel"])
+    def test_displays_server_error(self):
+        self.selenium.get(self.live_server_url + "/regular/basic/")
+        debug_window = self.selenium.find_element_by_id("djDebugWindow")
+        self.selenium.find_element_by_class_name("BuggyPanel").click()
+        WebDriverWait(self.selenium, timeout=3).until(EC.visibility_of(debug_window))
+        self.assertEqual(debug_window.text, "»\n500: Internal Server Error")