From 12b4417c56d8aa76cbe3a36c026962612453ee6e Mon Sep 17 00:00:00 2001
From: noon <14049705+noon-io@users.noreply.github.com>
Date: Wed, 21 Feb 2024 02:30:50 +0100
Subject: [PATCH 1/2] test #22 Improve json_request.py coverage

---
 tests/test_http_request.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/test_http_request.py b/tests/test_http_request.py
index 6dc9ec8b7..d1c435468 100644
--- a/tests/test_http_request.py
+++ b/tests/test_http_request.py
@@ -1642,6 +1642,26 @@ class JsonRequestTest(RequestTest):
             self.assertEqual(kwargs["ensure_ascii"], True)
             self.assertEqual(kwargs["allow_nan"], True)
 
+    def test_replacement_both_body_and_data_warns(self):
+        """Test that we can get a warning if both body and data are passed for branch coverage"""
+        body1 = None
+        body2 = b"body"
+        data1 = {
+            "name1": "value1",
+        }
+        data2 = {
+            "name2": "value2",
+        }
+        r1 = self.request_class(url="http://www.example.com/", data=data1, body=body1)
+
+        with mock.patch("warnings.warn") as mock_warn:
+            r1.replace(data=data2, body=body2)
+            mock_warn.assert_called_once()
+            (warning_message,), _ = mock_warn.call_args
+            self.assertIn(
+                "Both body and data passed. data will be ignored", warning_message
+            )
+
     def tearDown(self):
         warnings.resetwarnings()
         super().tearDown()

From b7a7ae7dbbaddd9d14b50c1257370af51e1ac1b5 Mon Sep 17 00:00:00 2001
From: noon <14049705+noon-io@users.noreply.github.com>
Date: Wed, 21 Feb 2024 21:04:45 +0100
Subject: [PATCH 2/2] refactor #22 Change comment and warning catching

---
 tests/test_http_request.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/test_http_request.py b/tests/test_http_request.py
index d1c435468..a45293695 100644
--- a/tests/test_http_request.py
+++ b/tests/test_http_request.py
@@ -1643,7 +1643,7 @@ class JsonRequestTest(RequestTest):
             self.assertEqual(kwargs["allow_nan"], True)
 
     def test_replacement_both_body_and_data_warns(self):
-        """Test that we can get a warning if both body and data are passed for branch coverage"""
+        """Test that we get a warning if both body and data are passed"""
         body1 = None
         body2 = b"body"
         data1 = {
@@ -1654,12 +1654,11 @@ class JsonRequestTest(RequestTest):
         }
         r1 = self.request_class(url="http://www.example.com/", data=data1, body=body1)
 
-        with mock.patch("warnings.warn") as mock_warn:
+        with warnings.catch_warnings(record=True) as _warnings:
             r1.replace(data=data2, body=body2)
-            mock_warn.assert_called_once()
-            (warning_message,), _ = mock_warn.call_args
             self.assertIn(
-                "Both body and data passed. data will be ignored", warning_message
+                "Both body and data passed. data will be ignored",
+                str(_warnings[0].message),
             )
 
     def tearDown(self):