Merge pull request #1331 from MDziwny/master

Allow empty data with content type application/json

Author: matthiask

debug_toolbar/panels/history/panel.py

@@ -48,7 +48,11 @@ def generate_stats(self, request, response):
                 data = request.POST.copy()
             # GraphQL tends to not be populated in POST. If the request seems
             # empty, check if it's a JSON request.
-            if not data and request.META.get("CONTENT_TYPE") == "application/json":
+            if (
+                not data
+                and request.body
+                and request.META.get("CONTENT_TYPE") == "application/json"
+            ):
                 # Python <= 3.5's json.loads expects a string.
                 data = json.loads(
                     request.body

tests/panels/test_history.py

@@ -28,13 +28,21 @@ def test_post(self):
         self.assertEqual(data["foo"], "bar")
 
     def test_post_json(self):
-        self.request = rf.post(
-            "/", data={"foo": "bar"}, content_type="application/json"
-        )
-        response = self.panel.process_request(self.request)
-        self.panel.generate_stats(self.request, response)
-        data = self.panel.get_stats()["data"]
-        self.assertEqual(data["foo"], "bar")
+        for data, expected_stats_data in (
+            ({"foo": "bar"}, {"foo": "bar"}),
+            ("", {}),
+        ):
+            with self.subTest(data=data):
+                self.request = rf.post(
+                    "/",
+                    data=data,
+                    content_type="application/json",
+                    CONTENT_TYPE="application/json",  # Force django test client to add the content-type even if no data
+                )
+                response = self.panel.process_request(self.request)
+                self.panel.generate_stats(self.request, response)
+                data = self.panel.get_stats()["data"]
+                self.assertDictEqual(data, expected_stats_data)
 
     def test_urls(self):
         self.assertEqual(