--- a/server/python/django2/renkanmanager/tests/v1_0/tests_revision.py Wed Apr 27 16:36:30 2016 +0200
+++ b/server/python/django2/renkanmanager/tests/v1_0/tests_revision.py Tue May 03 14:32:28 2016 +0200
@@ -24,21 +24,24 @@
post_url = reverse("v1.0:renkan_list")
self.test_title = "test_title_1"
- self.test_content = json.dumps({
+ test_content_dict_init = {
"id": "",
"title": "test_title_1",
- "description": "test_description_1",
- "created": "",
- "updated": "",
+ "description": "",
+ "created": "2016-03-11 15:10:10.645193+00:00",
+ "updated": "2016-03-11 15:10:10.645193+00:00",
"edges": [],
"nodes": [],
"users": [],
"space_id": "",
"views": []
- })
+ }
+ self.test_content = json.dumps(test_content_dict_init)
self.test_data = {"title": self.test_title, "content": self.test_content}
post_response = self.client.post(post_url, self.test_data, format="json")
post_response_dict = json.loads(post_response.content.decode())
+ self.test_content_dict = json.loads(post_response_dict.get("content", "{}"))
+ self.post_response_content_dict = json.loads(post_response_dict.get("content", "{}"))
self.test_renkan_guid = post_response_dict.get("id", "")
self.test_initial_revision_guid = post_response_dict.get("current_revision_id", "")
@@ -59,7 +62,6 @@
self.assertEqual(get_response_dict.get("revision_created_by", ""), getattr(self.user, User.USERNAME_FIELD))
self.assertEqual(get_response_dict.get("revision_last_updated_by", ""), getattr(self.user, User.USERNAME_FIELD))
self.assertEqual(get_response_dict.get("title", ""), self.test_data.get("title", ""))
- self.assertEqual(get_response_dict.get("content", ""), self.test_data.get("content", ""))
###################################################
# GETting with wrong renkan guid
@@ -96,6 +98,7 @@
put_title = "edited_title"
put_data = {
"title" : put_title,
+ "validation_timestamp": self.post_response_content_dict.get("updated", ""),
"create_new_revision": True
}
put_response = self.client.put(put_url, put_data, format="json")
@@ -139,6 +142,7 @@
put_title = "edited_title"
put_data = {
"title" : put_title,
+ "validation_timestamp": self.post_response_content_dict.get("updated", ""),
"create_new_revision": True
}
put_response = self.client.put(put_url, put_data, format="json")