Changed instances of json.loads(r.content) to r.json(). Changed some instances of assert* to assertContains.
- Legacy-Id: 16338
This commit is contained in:
Henrik Levkowetz
parent
4b080c8042
commit
05f275a3af
|
|
@ -194,7 +194,7 @@ class TastypieApiTestCase(ResourceTestCaseMixin, TestCase):
|
|||
client = Client(Accept='application/json')
|
||||
r = client.get("/api/v1/")
|
||||
self.assertValidJSONResponse(r)
|
||||
resource_list = json.loads(r.content)
|
||||
resource_list = r.json()
|
||||
|
||||
for name in self.apps:
|
||||
if not name in self.apps:
|
||||
|
|
@ -207,14 +207,14 @@ class TastypieApiTestCase(ResourceTestCaseMixin, TestCase):
|
|||
def test_all_model_resources_exist(self):
|
||||
client = Client(Accept='application/json')
|
||||
r = client.get("/api/v1")
|
||||
top = json.loads(r.content)
|
||||
top = r.json()
|
||||
for name in self.apps:
|
||||
app_name = self.apps[name]
|
||||
app = import_module(app_name)
|
||||
self.assertEqual("/api/v1/%s/"%name, top[name]["list_endpoint"])
|
||||
r = client.get(top[name]["list_endpoint"])
|
||||
self.assertValidJSONResponse(r)
|
||||
app_resources = json.loads(r.content)
|
||||
app_resources = r.json()
|
||||
#
|
||||
model_list = apps.get_app_config(name).get_models()
|
||||
for model in model_list:
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ class CommunityListTests(TestCase):
|
|||
# track
|
||||
r = self.client.post(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertEqual(json.loads(r.content)["success"], True)
|
||||
self.assertEqual(r.json()["success"], True)
|
||||
clist = CommunityList.objects.get(user__username="plain")
|
||||
self.assertEqual(list(clist.added_docs.all()), [draft])
|
||||
|
||||
|
|
@ -233,7 +233,7 @@ class CommunityListTests(TestCase):
|
|||
url = urlreverse(ietf.community.views.untrack_document, kwargs={ "username": "plain", "name": draft.name })
|
||||
r = self.client.post(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertEqual(json.loads(r.content)["success"], True)
|
||||
self.assertEqual(r.json()["success"], True)
|
||||
clist = CommunityList.objects.get(user__username="plain")
|
||||
self.assertEqual(list(clist.added_docs.all()), [])
|
||||
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ class SearchTests(TestCase):
|
|||
})
|
||||
r = self.client.get(url, dict(q=draft.name))
|
||||
self.assertEqual(r.status_code, 200)
|
||||
data = json.loads(r.content)
|
||||
data = r.json()
|
||||
self.assertEqual(data[0]["id"], draft.pk)
|
||||
|
||||
# DocAlias
|
||||
|
|
@ -288,7 +288,7 @@ class SearchTests(TestCase):
|
|||
|
||||
r = self.client.get(url, dict(q=doc_alias.name))
|
||||
self.assertEqual(r.status_code, 200)
|
||||
data = json.loads(r.content)
|
||||
data = r.json()
|
||||
self.assertEqual(data[0]["id"], doc_alias.pk)
|
||||
|
||||
def test_recent_drafts(self):
|
||||
|
|
@ -786,7 +786,7 @@ class DocTestCase(TestCase):
|
|||
|
||||
r = self.client.get(urlreverse("ietf.doc.views_doc.document_json", kwargs=dict(name=doc.name)))
|
||||
self.assertEqual(r.status_code, 200)
|
||||
data = json.loads(r.content)
|
||||
data = r.json()
|
||||
self.assertEqual(doc.name, data['name'])
|
||||
self.assertEqual(doc.pages,data['pages'])
|
||||
|
||||
|
|
@ -1268,12 +1268,12 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
|
|||
# No match
|
||||
r = self.client.get(conf_url + '?activedrafts=on&name=thisisnotadocumentname')
|
||||
self.assertValidJSONResponse(r)
|
||||
d = json.loads(unicontent(r))
|
||||
d = r.json()
|
||||
self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
|
||||
|
||||
r = self.client.get(conf_url + '?activedrafts=on&name=%s'%doc.name[6:12])
|
||||
self.assertValidJSONResponse(r)
|
||||
d = json.loads(unicontent(r))
|
||||
d = r.json()
|
||||
self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
|
||||
self.assertEqual(len(d['series'][0]['data']), 0)
|
||||
|
||||
|
|
@ -1290,12 +1290,12 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
|
|||
# No match
|
||||
r = self.client.get(data_url + '?activedrafts=on&name=thisisnotadocumentname')
|
||||
self.assertValidJSONResponse(r)
|
||||
d = json.loads(unicontent(r))
|
||||
d = r.json()
|
||||
self.assertEqual(unicontent(r), '[]')
|
||||
|
||||
r = self.client.get(data_url + '?activedrafts=on&name=%s'%doc.name[6:12])
|
||||
self.assertValidJSONResponse(r)
|
||||
d = json.loads(unicontent(r))
|
||||
d = r.json()
|
||||
self.assertEqual(len(d), 1)
|
||||
self.assertEqual(len(d[0]), 2)
|
||||
|
||||
|
|
@ -1319,7 +1319,7 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
|
|||
|
||||
r = self.client.get(conf_url)
|
||||
self.assertValidJSONResponse(r)
|
||||
d = json.loads(unicontent(r))
|
||||
d = r.json()
|
||||
self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
|
||||
self.assertEqual("New draft revisions over time for %s" % person.name, d['title']['text'])
|
||||
|
||||
|
|
@ -1327,7 +1327,7 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
|
|||
|
||||
r = self.client.get(data_url)
|
||||
self.assertValidJSONResponse(r)
|
||||
d = json.loads(unicontent(r))
|
||||
d = r.json()
|
||||
self.assertEqual(len(d), 1)
|
||||
self.assertEqual(len(d[0]), 2)
|
||||
|
||||
|
|
|
|||
|
|
@ -152,9 +152,7 @@ class ReviewTests(TestCase):
|
|||
|
||||
url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ "name": doc.name })
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
content = unicontent(r)
|
||||
self.assertTrue("{} Review".format(review_req.type.name) in content)
|
||||
self.assertContains(r, ("{} Review".format(review_req.type.name))
|
||||
|
||||
def test_review_request(self):
|
||||
doc = WgDraftFactory(group__acronym='mars',rev='01')
|
||||
|
|
@ -166,9 +164,8 @@ class ReviewTests(TestCase):
|
|||
url = urlreverse('ietf.doc.views_review.review_request', kwargs={ "name": doc.name, "request_id": review_req.pk })
|
||||
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertIn(review_req.team.acronym, unicontent(r))
|
||||
self.assertIn(review_req.team.name, unicontent(r))
|
||||
self.assertContains(r, review_req.team.acronym)
|
||||
self.assertContains(r, review_req.team.name)
|
||||
|
||||
url = urlreverse('ietf.doc.views_review.review_request_forced_login', kwargs={ "name": doc.name, "request_id": review_req.pk })
|
||||
r = self.client.get(url)
|
||||
|
|
@ -539,7 +536,7 @@ class ReviewTests(TestCase):
|
|||
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
messages = json.loads(r.content)["messages"]
|
||||
messages = r.json()["messages"]
|
||||
self.assertEqual(len(messages), 2)
|
||||
|
||||
today = datetime.date.today()
|
||||
|
|
@ -568,7 +565,7 @@ class ReviewTests(TestCase):
|
|||
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
result = json.loads(r.content)
|
||||
result = r.json()
|
||||
self.assertNotIn('messages', result)
|
||||
self.assertIn('No results found', result['error'])
|
||||
|
||||
|
|
@ -662,10 +659,8 @@ class ReviewTests(TestCase):
|
|||
# check the review document page
|
||||
url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ "name": assignment.review.name })
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
content = unicontent(r)
|
||||
self.assertIn("{} Review".format(assignment.review_request.type.name), content)
|
||||
self.assertIn("This is a review", content)
|
||||
self.assertContains("{} Review".format(assignment.review_request.type.name))
|
||||
self.assertContains("This is a review")
|
||||
|
||||
|
||||
def test_complete_review_enter_content(self):
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ class AjaxTests(TestCase):
|
|||
self.client.login(username="secretary", password="secretary+password")
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
data = json.loads(r.content)
|
||||
data = r.json()
|
||||
self.assertEqual(data["error"], False)
|
||||
self.assertEqual(data["post_only"], False)
|
||||
self.assertTrue('cc' in data)
|
||||
|
|
@ -205,7 +205,7 @@ class AjaxTests(TestCase):
|
|||
self.client.login(username="secretary", password="secretary+password")
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
data = json.loads(r.content)
|
||||
data = r.json()
|
||||
self.assertEqual(data["to_contacts"],['test@example.com'])
|
||||
|
||||
def test_ajax_select2_search_liaison_statements(self):
|
||||
|
|
@ -216,14 +216,14 @@ class AjaxTests(TestCase):
|
|||
self.client.login(username="secretary", password="secretary+password")
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
data = json.loads(r.content)
|
||||
data = r.json()
|
||||
self.assertTrue(liaison.pk in [ x['id'] for x in data ])
|
||||
|
||||
# test id search
|
||||
url = urlreverse('ietf.liaisons.views.ajax_select2_search_liaison_statements') + "?q=%s" % liaison.pk
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
data = json.loads(r.content)
|
||||
data = r.json()
|
||||
self.assertTrue(liaison.pk in [ x['id'] for x in data ])
|
||||
|
||||
|
||||
|
|
@ -303,7 +303,7 @@ class LiaisonManagementTests(TestCase):
|
|||
self.assertContains(r, 'Private comment')
|
||||
self.client.logout()
|
||||
r = self.client.get(url)
|
||||
self.assertFalse('Private comment' in r.content)
|
||||
self.assertNotContains(r, 'Private comment')
|
||||
|
||||
def test_taken_care_of(self):
|
||||
liaison = LiaisonStatementFactory(deadline=datetime.date.today()+datetime.timedelta(days=1))
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ class ApiTests(TestCase):
|
|||
self.client.login(username="ad", password="ad+password")
|
||||
r = do_unschedule(mars_scheduled)
|
||||
self.assertEqual(r.status_code, 403)
|
||||
self.assertTrue("error" in json.loads(r.content))
|
||||
self.assertTrue("error" in r.json())
|
||||
# faulty post
|
||||
r = do_schedule(schedule,ames_session,mars_slot)
|
||||
self.assertEqual(r.status_code, 403)
|
||||
|
|
@ -78,7 +78,7 @@ class ApiTests(TestCase):
|
|||
self.client.login(username="plain", password='plain+password')
|
||||
r = do_unschedule(ames_scheduled)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue("error" not in json.loads(r.content))
|
||||
self.assertNotIn("error", r.json())
|
||||
|
||||
r = do_schedule(schedule,ames_session,mars_slot)
|
||||
self.assertEqual(r.status_code, 201)
|
||||
|
|
@ -90,13 +90,13 @@ class ApiTests(TestCase):
|
|||
# Extend the mars session
|
||||
r = do_extend(schedule,mars_scheduled)
|
||||
self.assertEqual(r.status_code, 201)
|
||||
self.assertTrue("error" not in json.loads(r.content))
|
||||
self.assertTrue("error" not in r.json())
|
||||
self.assertEqual(mars_session.timeslotassignments.filter(schedule__name='test-agenda').count(),2)
|
||||
|
||||
# Unschedule mars
|
||||
r = do_unschedule(mars_scheduled)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue("error" not in json.loads(r.content))
|
||||
self.assertNotIn("error", r.json())
|
||||
# Make sure it got both the original and extended session
|
||||
self.assertEqual(mars_session.timeslotassignments.filter(schedule__name='test-agenda').count(),0)
|
||||
|
||||
|
|
@ -116,7 +116,7 @@ class ApiTests(TestCase):
|
|||
|
||||
r = self.client.get(urlreverse("ietf.meeting.ajax.session_constraints", kwargs=dict(num=meeting.number, sessionid=session.pk)))
|
||||
self.assertEqual(r.status_code, 200)
|
||||
constraints = json.loads(r.content)
|
||||
constraints = r.json()
|
||||
self.assertEqual(set([c_ames.pk, c_person.pk]), set(c["constraint_id"] for c in constraints))
|
||||
|
||||
def test_meeting_json(self):
|
||||
|
|
@ -124,7 +124,7 @@ class ApiTests(TestCase):
|
|||
|
||||
r = self.client.get(urlreverse("ietf.meeting.ajax.meeting_json", kwargs=dict(num=meeting.number)))
|
||||
self.assertEqual(r.status_code, 200)
|
||||
info = json.loads(r.content)
|
||||
info = r.json()
|
||||
self.assertEqual(info["name"], meeting.number)
|
||||
|
||||
def test_get_room_json(self):
|
||||
|
|
@ -133,7 +133,7 @@ class ApiTests(TestCase):
|
|||
|
||||
r = self.client.get(urlreverse("ietf.meeting.ajax.timeslot_roomurl", kwargs=dict(num=meeting.number, roomid=room.pk)))
|
||||
self.assertEqual(r.status_code, 200)
|
||||
info = json.loads(r.content)
|
||||
info = r.json()
|
||||
self.assertEqual(info["name"], room.name)
|
||||
|
||||
def test_create_new_room(self):
|
||||
|
|
@ -186,7 +186,7 @@ class ApiTests(TestCase):
|
|||
url = urlreverse("ietf.group.views.group_json", kwargs=dict(acronym=group.acronym))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
info = json.loads(r.content)
|
||||
info = r.json()
|
||||
self.assertEqual(info["name"], group.name)
|
||||
|
||||
# This really belongs in person tests
|
||||
|
|
@ -197,7 +197,7 @@ class ApiTests(TestCase):
|
|||
url = urlreverse("ietf.person.ajax.person_json", kwargs=dict(personid=person.pk))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
info = json.loads(r.content)
|
||||
info = r.json()
|
||||
self.assertEqual(info["name"], person.name)
|
||||
|
||||
def test_sessions_json(self):
|
||||
|
|
@ -206,7 +206,7 @@ class ApiTests(TestCase):
|
|||
url = urlreverse("ietf.meeting.ajax.sessions_json",kwargs=dict(num=meeting.number))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
info = json.loads(r.content)
|
||||
info = r.json()
|
||||
self.assertEqual(set([x['short_name'] for x in info]),set([s.session.short_name for s in meeting.agenda.assignments.filter(session__type_id='session')]))
|
||||
|
||||
schedule = meeting.agenda
|
||||
|
|
@ -214,7 +214,7 @@ class ApiTests(TestCase):
|
|||
kwargs=dict(num=meeting.number,owner=schedule.owner_email(),name=schedule.name))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
info = json.loads(r.content)
|
||||
info = r.json()
|
||||
self.assertEqual(len(info),schedule.assignments.count())
|
||||
|
||||
|
||||
|
|
@ -226,7 +226,7 @@ class ApiTests(TestCase):
|
|||
kwargs=dict(num=meeting.number, slotid=slot.pk))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
info = json.loads(r.content)
|
||||
info = r.json()
|
||||
self.assertEqual(info["timeslot_id"], slot.pk)
|
||||
|
||||
def test_create_new_slot(self):
|
||||
|
|
@ -282,7 +282,7 @@ class ApiTests(TestCase):
|
|||
name=meeting.agenda.name))
|
||||
|
||||
r = self.client.get(url)
|
||||
info = json.loads(r.content)
|
||||
info = r.json()
|
||||
self.assertEqual(info["schedule_id"], meeting.agenda.pk)
|
||||
|
||||
def test_create_new_schedule(self):
|
||||
|
|
@ -406,7 +406,7 @@ class ApiTests(TestCase):
|
|||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
|
||||
info = json.loads(r.content)
|
||||
info = r.json()
|
||||
self.assertEqual(info['secretariat'], True)
|
||||
self.assertEqual(urlsplit(info['owner_href'])[2], "/person/%s.json" % meeting.agenda.owner_id)
|
||||
self.assertEqual(info['read_only'], True)
|
||||
|
|
@ -419,7 +419,7 @@ class ApiTests(TestCase):
|
|||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
|
||||
info = json.loads(r.content)
|
||||
info = r.json()
|
||||
self.assertEqual(info['secretariat'], False)
|
||||
self.assertEqual(info['read_only'], False)
|
||||
self.assertEqual(info['save_perm'], False)
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class PersonTests(TestCase):
|
|||
|
||||
r = self.client.get(urlreverse("ietf.person.views.ajax_select2_search", kwargs={ "model_name": "email"}), dict(q=person.name))
|
||||
self.assertEqual(r.status_code, 200)
|
||||
data = json.loads(r.content)
|
||||
data = r.json()
|
||||
self.assertEqual(data[0]["id"], person.email_address())
|
||||
|
||||
def test_default_email(self):
|
||||
|
|
|
|||
Loading…
Reference in a new issue