@Natim review

Author: leplatrem

Makefile

@@ -1,4 +1,4 @@
-VIRTUALENV = virtualenv
+VIRTUALENV = virtualenv --python=python3.6
 VENV := $(shell echo $${VIRTUAL_ENV-.venv})
 PYTHON = $(VENV)/bin/python
 DEV_STAMP = $(VENV)/.dev_env_installed.stamp

kinto_http/batch.py

@@ -28,8 +28,7 @@ def request(self, method, endpoint, data=None, permissions=None,
         if permissions is not None:
             payload['permissions'] = permissions
 
-        self.requests.append((method, endpoint, payload.get("data"),
-                              payload.get("permissions"), headers))
+        self.requests.append((method, endpoint, payload, headers))
         # This is the signature of the session request.
         return defaultdict(dict), defaultdict(dict)
 
@@ -39,17 +38,13 @@ def reset(self):
 
     def _build_requests(self):
         requests = []
-        for (method, url, data, permissions, headers) in self.requests:
+        for (method, url, payload, headers) in self.requests:
             # Strip the prefix in batch requests.
             request = {
                 'method': method.upper(),
                 'path': url.replace('v1/', '')}
 
-            request['body'] = {}
-            if data is not None:
-                request['body']['data'] = data
-            if permissions is not None:
-                request['body']['permissions'] = permissions
+            request['body'] = payload
             if headers is not None:
                 request['headers'] = headers
             requests.append(request)

kinto_http/tests/test_client.py

@@ -26,6 +26,8 @@ def test_context_manager_works_as_expected(self):
             batch.create_record(id=1234, data={'foo': 'bar'})
             batch.create_record(id=5678, data={'bar': 'baz'})
             batch.patch_record(id=5678, data={'bar': 'biz'})
+            changes = JSONPatch([{'op': 'add', 'location': 'foo', 'value': 'bar'}])
+            batch.patch_record(id=5678, changes=changes)
 
         self.session.request.assert_called_with(
             method='POST',
@@ -42,7 +44,11 @@ def test_context_manager_works_as_expected(self):
                 {'body': {'data': {'bar': 'biz'}},
                  'path': '/buckets/mozilla/collections/test/records/5678',
                  'method': 'PATCH',
-                 'headers': {'Content-Type': 'application/json'}}]})
+                 'headers': {'Content-Type': 'application/json'}},
+                {'body': [{'op': 'add', 'location': 'foo', 'value': 'bar'}],
+                 'path': '/buckets/mozilla/collections/test/records/5678',
+                 'method': 'PATCH',
+                 'headers': {'Content-Type': 'application/json-patch+json'}}]})
 
     def test_batch_raises_exception(self):
         # Make the next call to sess.request raise a 403.