altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

Replaced multiple asserts with assertContains().

Browse source 
- Legacy-Id: 16353
This commit is contained in:
Henrik Levkowetz 2019-07-01 14:09:12 +00:00
parent f13887de7c
commit f5ae2541ad
5 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/secr/announcement/tests.py
View file

@ -1,3 +1,4 @@
# Copyright The IETF Trust 2013-2019, All Rights Reserved
from django.urls import reverse
from pyquery import PyQuery
@ -94,8 +95,7 @@ class SubmitAnnouncementCase(TestCase):
'body':'This is a test.'}
self.client.login(username="secretary", password="secretary+password")
response = self.client.post(url,post_data)
self.assertEqual(response.status_code, 200)
self.assertTrue('Confirm Announcement' in response.content)
self.assertContains(response, 'Confirm Announcement')
response = self.client.post(confirm_url,post_data,follow=True)
self.assertRedirects(response, url)
self.assertEqual(len(outbox),1)

4
ietf/secr/meetings/tests.py
View file

@ -224,7 +224,7 @@ class SecrMeetingTestCase(TestCase):
'name':'Test Morning Session'
}, follow=True)
self.assertRedirects(response, url)
self.assertTrue('Test Morning Session' in response.content)
self.assertContains(response, 'Test Morning Session')
def test_meetings_times_delete(self):
meeting = make_meeting_test_data()
@ -310,7 +310,7 @@ class SecrMeetingTestCase(TestCase):
'group':group.pk,
})
self.assertEqual(response.status_code, 200)
self.assertTrue('invalid format' in response.content)
self.assertContains(response, 'invalid format')
def test_meetings_nonsession_edit(self):
meeting = make_meeting_test_data()

4
ietf/secr/proceedings/tests.py
View file

@ -87,7 +87,7 @@ class RecordingTestCase(TestCase):
self.client.login(username="secretary", password="secretary+password")
response = self.client.post(url,data,follow=True)
self.assertEqual(response.status_code, 200)
self.assertTrue(group.acronym in response.content)
self.assertContains(response, group.acronym)
# now test edit
doc = session.materials.filter(type='recording').first()
@ -95,7 +95,7 @@ class RecordingTestCase(TestCase):
url = reverse('ietf.secr.proceedings.views.recording_edit', kwargs={'meeting_num':meeting.number,'name':doc.name})
response = self.client.post(url,dict(external_url=external_url),follow=True)
self.assertEqual(response.status_code, 200)
self.assertTrue(external_url in response.content)
self.assertContains(response, external_url)
def test_import_audio_files(self):
session = SessionFactory(status_id='sched',meeting__type_id='ietf')

5
ietf/secr/roles/tests.py
View file

@ -1,3 +1,4 @@
# Copyright The IETF Trust 2013-2019, All Rights Reserved
# -*- coding: utf-8 -*-
from django.urls import reverse
from ietf.utils.test_utils import TestCase
@ -47,7 +48,7 @@ class SecrRolesMainTestCase(TestCase):
self.client.login(username="secretary", password="secretary+password")
response = self.client.post(url,post_data,follow=True)
self.assertRedirects(response, target)
self.assertTrue('added successfully' in response.content)
self.assertContains(response, 'added successfully')
def test_roles_add_no_group(self):
person = Person.objects.get(name='Areað Irector')
@ -60,4 +61,4 @@ class SecrRolesMainTestCase(TestCase):
self.client.login(username="secretary", password="secretary+password")
response = self.client.post(url,post_data,follow=True)
self.assertEqual(response.status_code, 200)
self.assertTrue('You must select a group' in response.content)
self.assertContains(response, 'You must select a group')

8
ietf/secr/telechat/tests.py
View file

@ -76,9 +76,9 @@ class SecrTelechatTestCase(TestCase):
self.client.login(username="secretary", password="secretary+password")
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
self.assertTrue("Has downref: Yes" in response.content)
self.assertTrue("Add rfc6666" in response.content)
self.assertTrue("to downref registry" in response.content)
self.assertContains(response, "Has downref: Yes")
self.assertContains(response, "Add rfc6666")
self.assertContains(response, "to downref registry")
def test_doc_detail_draft_invalid(self):
'''Test using a document not on telechat agenda'''
@ -88,7 +88,7 @@ class SecrTelechatTestCase(TestCase):
self.client.login(username="secretary", password="secretary+password")
response = self.client.get(url, follow=True)
self.assertRedirects(response, reverse('ietf.secr.telechat.views.doc', kwargs={'date':date}))
self.assertTrue('not on the Telechat agenda' in response.content)
self.assertContains(response, 'not on the Telechat agenda')
def test_doc_detail_charter(self):
by=Person.objects.get(name="(System)")