diff -r 80ce81208b08 -r 3051b847c124 server/python/django2/renkanmanager/tests/v1_0/tests_renkan.py --- a/server/python/django2/renkanmanager/tests/v1_0/tests_renkan.py Tue Jun 21 10:30:08 2016 +0200 +++ b/server/python/django2/renkanmanager/tests/v1_0/tests_renkan.py Tue Jun 21 17:53:06 2016 +0200 @@ -1,4 +1,4 @@ -import json +import json, urllib from django.contrib.auth import get_user_model from django.core.urlresolvers import reverse @@ -311,13 +311,15 @@ # PUTting by updating current revision ################################################### - put_url = reverse("v1.0:renkan_detail", kwargs={"renkan_guid": renkan_guid}) + put_url = "%s?%s" % ( + reverse("v1.0:renkan_detail", kwargs={"renkan_guid": renkan_guid}), + urllib.parse.urlencode({'create_new_revision': False}) + ) put_content_dict = json.loads(self.first_test_content) put_content_dict["updated"] = post_response_ts put_data = { "title" : self.first_test_title, - "content" : json.dumps(put_content_dict), - "create_new_revision": False + "content" : json.dumps(put_content_dict) } put_response = self.client.put(put_url, put_data, format="json") self.assertEqual(put_response.status_code, status.HTTP_200_OK, "response is %r"%put_response.content) @@ -351,12 +353,15 @@ # PUTting by creating a new revision ################################################### + put_url = "%s?%s" % ( + reverse("v1.0:renkan_detail", kwargs={"renkan_guid": renkan_guid}), + urllib.parse.urlencode({'create_new_revision': True}) + ) put_content_dict = json.loads(self.second_test_content) put_content_dict["updated"] = put_response_ts put_data = { "title" : self.second_test_title, - "content" : json.dumps(put_content_dict), - "create_new_revision": True + "content" : json.dumps(put_content_dict) } put_response = self.client.put(put_url, put_data, format="json") self.assertEqual(put_response.status_code, status.HTTP_200_OK, "response is %r"%put_response.content) @@ -608,8 +613,14 @@ copy_renkan_guid = post_response_dict.get("id", "") # Adding another revision - put_data = {"title": self.first_test_title+"_edited!", "validation_timestamp": to_delete_renkan_ts, "create_new_revision": True} - put_url = reverse("v1.0:renkan_detail", kwargs={"renkan_guid":to_delete_renkan_guid}) + put_data = {"title": self.first_test_title+"_edited!"} + put_url = "%s?%s" % ( + reverse("v1.0:renkan_detail", kwargs={"renkan_guid":to_delete_renkan_guid}), + urllib.parse.urlencode({ + 'validation_timestamp' : to_delete_renkan_ts, + 'create_new_revision' : True + }) + ) put_response = self.client.put(put_url, put_data, format="json") self.assertEqual(Renkan.objects.count(), 2) self.assertEqual(Revision.objects.count(), 3)