Skip to content

Commit

Permalink
use r.json in document tests too
Browse files Browse the repository at this point in the history
  • Loading branch information
emillon committed Dec 18, 2014
1 parent 505100c commit 1d5c9d8
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions app/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ def test_annotation(self):
bad_data[key] = ok

r = self.client.get('/view/1/annotations')
d = json.loads(r.data)
anns = d['data']['2']
anns = r.json['data']['2']
self.assertEqual(len(anns), 1)
ann = anns[0]
id_retr = ann['id']
Expand All @@ -148,8 +147,7 @@ def test_annotation(self):
r = self.client.put('/annotation/{}'.format(id_retr), data=data)
self.assert200(r)
r = self.client.get('/view/1/annotations')
d = json.loads(r.data)
anns = d['data']['2']
anns = r.json['data']['2']
self.assertEqual(len(anns), 1)
ann = anns[0]
self.assertEqual(ann['height'], 60)
Expand All @@ -158,8 +156,7 @@ def test_annotation(self):
r = self.client.delete('/annotation/{}'.format(id_retr))
self.assert200(r)
r = self.client.get('/view/1/annotations')
d = json.loads(r.data)
self.assertNotIn('2', d['data'])
self.assertNotIn('2', r.json['data'])

def test_upload_rev(self):
r = self._upload('toto.pdf')
Expand Down Expand Up @@ -282,9 +279,7 @@ def test_share_link(self):
data = {'name': 'Bob'}
r = self.client.post(url_for('bp.share_doc', id=docid), data=data)
self.assert200(r)
d = json.loads(r.data)
self.assertIn('data', d)
h = d['data']
h = r.json['data']

h2 = h + 'x'
r = self.client.get(url_for('bp.view_shared_doc', key=h2))
Expand Down

0 comments on commit 1d5c9d8

Please sign in to comment.