Merge pull request #14 from sasha-kantoriz/a406246993541115_tests_ref…

…ormat A406246993541115 tests reformat
openprocurement · Aug 31, 2017 · e087497 · e087497
2 parents 80fd467 + 3743e7c
commit e087497
Show file tree

Hide file tree

Showing 5 changed files with 229 additions and 217 deletions.
diff --git a/openregistry/api/tests/base.py b/openregistry/api/tests/base.py
@@ -187,8 +187,10 @@ def create_resource(self, extra=None):
         if extra:
             data.update(extra)
         response = self.app.post_json('/', {'data': data})
+        self.assertEqual(response.status, '201 Created')
         resource = response.json['data']
         self.resource_token = response.json['access']['token']
+        self.access_header = {'X-Access-Token': str(response.json['access']['token'])}
         self.resource_id = resource['id']
         status = resource['status']
         if self.initial_status and self.initial_status != status:

diff --git a/openregistry/api/tests/blanks/core_resource.py b/openregistry/api/tests/blanks/core_resource.py
@@ -11,25 +11,25 @@ def empty_listing(self):
     self.assertEqual(response.json['next_page']['offset'], '')
     self.assertNotIn('prev_page', response.json)
 
-    response = self.app.get('/?opt_jsonp=callback')
+    response = self.app.get('/', params={'opt_jsonp': 'callback'})
     self.assertEqual(response.status, '200 OK')
     self.assertEqual(response.content_type, 'application/javascript')
     self.assertNotIn('{\n    "', response.body)
     self.assertIn('callback({', response.body)
 
-    response = self.app.get('/?opt_pretty=1')
+    response = self.app.get('/', params={'opt_pretty': 1})
     self.assertEqual(response.status, '200 OK')
     self.assertEqual(response.content_type, 'application/json')
     self.assertIn('{\n    "', response.body)
     self.assertNotIn('callback({', response.body)
 
-    response = self.app.get('/?opt_jsonp=callback&opt_pretty=1')
+    response = self.app.get('/', params={'opt_jsonp': 'callback', 'opt_pretty': 1})
     self.assertEqual(response.status, '200 OK')
     self.assertEqual(response.content_type, 'application/javascript')
     self.assertIn('{\n    "', response.body)
     self.assertIn('callback({', response.body)
 
-    response = self.app.get('/?offset=2015-01-01T00:00:00+02:00&descending=1&limit=10')
+    response = self.app.get('/', params={'offset': '2015-01-01T00:00:00+02:00', 'descending': 1, 'limit': 10})
     self.assertEqual(response.status, '200 OK')
     self.assertEqual(response.content_type, 'application/json')
     self.assertEqual(response.json['data'], [])
@@ -38,22 +38,22 @@ def empty_listing(self):
     self.assertNotIn('descending=1', response.json['prev_page']['uri'])
     self.assertIn('limit=10', response.json['prev_page']['uri'])
 
-    response = self.app.get('/?feed=changes')
+    response = self.app.get('/', params={'feed': 'changes'})
     self.assertEqual(response.status, '200 OK')
     self.assertEqual(response.content_type, 'application/json')
     self.assertEqual(response.json['data'], [])
     self.assertEqual(response.json['next_page']['offset'], '')
     self.assertNotIn('prev_page', response.json)
 
-    response = self.app.get('/?feed=changes&offset=0', status=404)
+    response = self.app.get('/', params={'feed': 'changes', 'offset': 0}, status=404)
     self.assertEqual(response.status, '404 Not Found')
     self.assertEqual(response.content_type, 'application/json')
     self.assertEqual(response.json['status'], 'error')
     self.assertEqual(response.json['errors'], [
         {u'description': u'Offset expired/invalid', u'location': u'querystring', u'name': u'offset'}
     ])
 
-    response = self.app.get('/?feed=changes&descending=1&limit=10')
+    response = self.app.get('/', params={'feed': 'changes', 'descending': 1, 'limit': 10})
     self.assertEqual(response.status, '200 OK')
     self.assertEqual(response.content_type, 'application/json')
     self.assertEqual(response.json['data'], [])