From c347acbff6545c428aa2c965cd03f03db6bae1bf Mon Sep 17 00:00:00 2001
From: kasun Herath <kasunh01@gmail.com>
Date: Sun, 9 Dec 2018 11:27:09 +0530
Subject: [PATCH] warning if body and data are provided

---
 scrapy/http/request/json_request.py |  7 ++++++-
 tests/test_http_request.py          | 25 ++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/scrapy/http/request/json_request.py b/scrapy/http/request/json_request.py
index 03a0ab061..3b791eda3 100644
--- a/scrapy/http/request/json_request.py
+++ b/scrapy/http/request/json_request.py
@@ -6,14 +6,19 @@ See documentation in docs/topics/request-response.rst
 """
 
 import json
+import warnings
 
 from scrapy.http.request import Request
 
 
 class JSONRequest(Request):
     def __init__(self, *args, **kwargs):
+        body_passed = 'body' in kwargs
         data = kwargs.pop('data', None)
-        if data:
+        if body_passed and data:
+            warnings.warn('Both body and data passed. data will be ignored')
+
+        elif not body_passed and data:
             kwargs['body'] = json.dumps(data)
 
             if 'method' not in kwargs:
diff --git a/tests/test_http_request.py b/tests/test_http_request.py
index 793a583bc..e5a85e6fc 100644
--- a/tests/test_http_request.py
+++ b/tests/test_http_request.py
@@ -3,6 +3,7 @@ import cgi
 import unittest
 import re
 import json
+import warnings
 
 import six
 from six.moves import xmlrpc_client as xmlrpclib
@@ -1153,6 +1154,10 @@ class JSONRequestTest(RequestTest):
     default_method = 'GET'
     default_headers = {b'Content-Type': [b'application/json'], b'Accept': [b'application/json, text/javascript, */*; q=0.01']}
 
+    def setUp(self):
+        warnings.simplefilter("always")
+        super(JSONRequestTest, self).setUp()
+
     def test_data(self):
         r1 = self.request_class(url="http://www.example.com/")
         self.assertEqual(r1.body, b'')
@@ -1170,9 +1175,23 @@ class JSONRequestTest(RequestTest):
         self.assertEqual(r3.body, to_bytes(json.dumps(data)))
         self.assertEqual(r3.method, 'POST')
 
-        r4 = self.request_class(url="http://www.example.com/", body=body, data=data)
-        self.assertEqual(r4.body, to_bytes(json.dumps(data)))
-        self.assertEqual(r4.method, 'POST')
+        with warnings.catch_warnings(record=True) as _warnings:
+            r4 = self.request_class(url="http://www.example.com/", body=body, data=data)
+            self.assertEqual(r4.body, body)
+            self.assertEqual(r4.method, 'GET')
+            self.assertEqual(len(_warnings), 1)
+            self.assertIn('data will be ignored', str(_warnings[0].message))
+
+        with warnings.catch_warnings(record=True) as _warnings:
+            r5 = self.request_class(url="http://www.example.com/", body=b'', data=data)
+            self.assertEqual(r5.body, b'')
+            self.assertEqual(r5.method, 'GET')
+            self.assertEqual(len(_warnings), 1)
+            self.assertIn('data will be ignored', str(_warnings[0].message))
+
+    def tearDown(self):
+        warnings.resetwarnings()
+        super(JSONRequestTest, self).tearDown()
 
 
 if __name__ == "__main__":