From f5ae2541addd9a448ced088b91d530ad1379bc2b Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 1 Jul 2019 14:09:12 +0000 Subject: [PATCH] Replaced multiple asserts with assertContains(). - Legacy-Id: 16353 --- ietf/secr/announcement/tests.py | 4 ++-- ietf/secr/meetings/tests.py | 4 ++-- ietf/secr/proceedings/tests.py | 4 ++-- ietf/secr/roles/tests.py | 5 +++-- ietf/secr/telechat/tests.py | 8 ++++---- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ietf/secr/announcement/tests.py b/ietf/secr/announcement/tests.py index d7ba222eb..1110c0f23 100644 --- a/ietf/secr/announcement/tests.py +++ b/ietf/secr/announcement/tests.py @@ -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) diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py index fb63ceaf7..325b53202 100644 --- a/ietf/secr/meetings/tests.py +++ b/ietf/secr/meetings/tests.py @@ -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() diff --git a/ietf/secr/proceedings/tests.py b/ietf/secr/proceedings/tests.py index 66cb0b873..0c8dc6af9 100644 --- a/ietf/secr/proceedings/tests.py +++ b/ietf/secr/proceedings/tests.py @@ -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') diff --git a/ietf/secr/roles/tests.py b/ietf/secr/roles/tests.py index c4cdf88cf..344634563 100644 --- a/ietf/secr/roles/tests.py +++ b/ietf/secr/roles/tests.py @@ -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') diff --git a/ietf/secr/telechat/tests.py b/ietf/secr/telechat/tests.py index 5b7245191..26d50d2ba 100644 --- a/ietf/secr/telechat/tests.py +++ b/ietf/secr/telechat/tests.py @@ -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)")