Use specific asserts in tests.

Also, remove a commented-out test.

jobs/tests/test_models.py

@@ -77,9 +77,9 @@ def test_visible_manager(self):
 
         visible = Job.objects.visible()
         self.assertTrue(len(visible), 1)
-        self.assertTrue(j1 in visible)
-        self.assertFalse(j2 in visible)
-        self.assertFalse(j3 in visible)
+        self.assertIn(j1, visible)
+        self.assertNotIn(j2, visible)
+        self.assertNotIn(j3, visible)
 
     def test_job_type_with_active_jobs_manager(self):
         t1 = factories.JobTypeFactory()
@@ -89,8 +89,8 @@ def test_job_type_with_active_jobs_manager(self):
 
         qs = JobType.objects.with_active_jobs()
         self.assertEqual(len(qs), 1)
-        self.assertTrue(t1 in qs)
-        self.assertFalse(t2 in qs)
+        self.assertIn(t1, qs)
+        self.assertNotIn(t2, qs)
 
     def test_job_category_with_active_jobs_manager(self):
         c1 = factories.JobCategoryFactory()
@@ -101,8 +101,8 @@ def test_job_category_with_active_jobs_manager(self):
 
         qs = JobCategory.objects.with_active_jobs()
         self.assertEqual(len(qs), 1)
-        self.assertTrue(c1 in qs)
-        self.assertFalse(c2 in qs)
+        self.assertIn(c1, qs)
+        self.assertNotIn(c2, qs)
 
     def test_get_previous_approved(self):
         job1 = self.create_job(status=Job.STATUS_APPROVED)

jobs/tests/test_views.py

@@ -163,7 +163,7 @@ def test_job_detail_security(self):
 
         # Normal users can't see non-approved Jobs
         response = self.client.get(self.job_draft.get_absolute_url())
-        self.assertTrue(response.status_code in [401, 404])
+        self.assertIn(response.status_code, [401, 404])
 
         # Staff can see everything
         self.client.login(username=staff_user.username, password='password')
@@ -271,8 +271,8 @@ def test_job_types(self):
         url = reverse('jobs:job_types')
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(self.job_type in response.context['types'])
-        self.assertFalse(job_type2 in response.context['types'])
+        self.assertIn(self.job_type, response.context['types'])
+        self.assertNotIn(job_type2, response.context['types'])
 
     def test_job_categories(self):
         job_category2 = JobCategoryFactory(
@@ -283,8 +283,8 @@ def test_job_categories(self):
         url = reverse('jobs:job_categories')
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(self.job_category in response.context['categories'])
-        self.assertFalse(job_category2 in response.context['categories'])
+        self.assertIn(self.job_category, response.context['categories'])
+        self.assertNotIn(job_category2, response.context['categories'])
 
     def test_job_locations(self):
         job2 = ReviewJobFactory(
@@ -300,18 +300,18 @@ def test_job_locations(self):
         url = reverse('jobs:job_locations')
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(self.job in response.context['jobs'])
-        self.assertFalse(job2 in response.context['jobs'])
+        self.assertIn(self.job, response.context['jobs'])
+        self.assertNotIn(job2, response.context['jobs'])
 
         content = str(response.content)
-        self.assertTrue('Memphis' in content)
-        self.assertFalse('Lawrence' in content)
+        self.assertIn('Memphis', content)
+        self.assertNotIn('Lawrence', content)
 
     def test_job_telecommute(self):
         url = reverse('jobs:job_telecommute')
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(self.job in response.context['jobs'])
+        self.assertIn(self.job, response.context['jobs'])
 
     def test_job_display_name(self):
         self.assertEqual(self.job.display_name,
@@ -421,9 +421,9 @@ def test_job_review(self):
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.context['object_list']), 3)
-        self.assertTrue(self.job1 in response.context['object_list'])
-        self.assertTrue(self.job2 in response.context['object_list'])
-        self.assertTrue(self.job3 in response.context['object_list'])
+        self.assertIn(self.job1, response.context['object_list'])
+        self.assertIn(self.job2, response.context['object_list'])
+        self.assertIn(self.job3, response.context['object_list'])
 
         # no email notifications sent before offer is approved
         self.assertEqual(len(mail.outbox), 0)
@@ -436,7 +436,7 @@ def test_job_review(self):
         self.assertEqual(len(mail.outbox), 1)
         message = mail.outbox[0]
         self.assertEqual(message.to, [self.creator.email, 'jobs@python.org'])
-        self.assertTrue(self.contact in message.body)
+        self.assertIn(self.contact, message.body)
         mail.outbox = []
 
         # no email notifications sent before offer is rejected
@@ -450,7 +450,7 @@ def test_job_review(self):
         self.assertEqual(len(mail.outbox), 1)
         message = mail.outbox[0]
         self.assertEqual(message.to, [self.creator.email, 'jobs@python.org'])
-        self.assertTrue(self.contact in message.body)
+        self.assertIn(self.contact, message.body)
         mail.outbox = []
 
         self.client.post(url, data={'job_id': self.job3.pk, 'action': 'remove'})
@@ -480,7 +480,7 @@ def test_job_comment(self):
         self.assertEqual(len(mail.outbox), 0)
         response = self.client.post(url, form_data)
         self.assertEqual(response.status_code, 302)
-        self.assertTrue('http://testserver/comments/posted/?c=' in response['Location'])
+        self.assertIn('http://testserver/comments/posted/?c=', response['Location'])
 
         mail_sent_queue.get(block=True)
         self.assertEqual(len(mail.outbox), 1)
@@ -499,7 +499,7 @@ def test_job_comment(self):
         form_data.update(form.initial)
         response = self.client.post(url, form_data)
         self.assertEqual(response.status_code, 302)
-        self.assertTrue('http://testserver/comments/posted/?c=' in response['Location'])
+        self.assertIn('http://testserver/comments/posted/?c=', response['Location'])
 
         mail_sent_queue.get(block=True)
         self.assertEqual(len(mail.outbox), 3)

users/tests/test_forms.py

@@ -28,7 +28,7 @@ def test_user_creation_form(self):
             'password2': 'password'
         })
         self.assertFalse(form.is_valid())
-        self.assertTrue('username' in form.errors)
+        self.assertIn('username', form.errors)
 
         # password mismatch
         form = UserCreationForm({
@@ -37,21 +37,4 @@ def test_user_creation_form(self):
             'password2': 'passwordmismatch'
         })
         self.assertFalse(form.is_valid())
-        self.assertTrue('password2' in form.errors)
-
-    '''
-    def test_user_change_form(self):
-        user = User.objects.create_user(
-            username='username',
-            password='password'
-        )
-        form = UserChangeForm({
-            'username': 'username2',
-            'last_login': user.last_login,
-            'date_joined': user.date_joined
-        }, instance=user)
-        self.assertTrue(form.is_valid())
-        user = form.save()
-        user = User.objects.get(pk=user.pk)
-        self.assertEqual(user.username, 'username2')
-    '''
+        self.assertIn('password2', form.errors)