fix login view test

rloomans · Feb 25, 2017 · cefc030 · cefc030
1 parent c6999c5
commit cefc030
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/teamtemp/tests/view/admin_only_view_testcase.py b/teamtemp/tests/view/admin_only_view_testcase.py
@@ -48,7 +48,6 @@ def assertDoesLoginRedirect(self, response, expected_url=None, redirect_to=None)
             expected_url = self.login_url(redirect_to=redirect_to)
 
         self.assertRedirects(response, expected_url=expected_url, status_code=status.HTTP_302_FOUND)
-        self.assertIsPasswordForm(response)
 
     def setUpAdmin(self):
         session = self.client.session

diff --git a/teamtemp/tests/view/test_admin_view.py b/teamtemp/tests/view/test_admin_view.py
@@ -5,6 +5,7 @@ class AdminViewTestCases(AdminOnlyViewTestCase):
     def test_no_admin_no_team_view(self):
         response = self.client.get(self.admin_url(), follow=True)
         self.assertDoesLoginRedirect(response, redirect_to=self.admin_url())
+        self.assertIsPasswordForm(response)
 
     def test_admin_no_team_view(self):
         self.setUpAdmin()
@@ -16,6 +17,7 @@ def test_no_admin_team_view(self):
         admin_url = self.admin_url(for_team=True)
         response = self.client.get(admin_url, follow=True)
         self.assertDoesLoginRedirect(response, redirect_to=admin_url)
+        self.assertIsPasswordForm(response)
 
     def test_admin_team_view(self):
         self.setUpAdmin()

diff --git a/teamtemp/tests/view/test_login_view.py b/teamtemp/tests/view/test_login_view.py
@@ -9,6 +9,6 @@ def test_not_loggedin_view(self):
     def test_loggedin_view(self):
         self.setUpAdmin()
         response = self.client.get(self.login_url(), follow=True)
-        self.assertDoesLoginRedirect(response, redirect_to=self.admin_url())
+        self.assertDoesLoginRedirect(response, expected_url=self.admin_url())
         self.assertIsNotPasswordForm(response)
         self.assertIsAdminForm(response)
diff --git a/teamtemp/tests/view/test_reset_view.py b/teamtemp/tests/view/test_reset_view.py
@@ -8,6 +8,7 @@ def test_no_admin_reset_view(self):
         reset_url = reverse('reset', kwargs={'survey_id': self.teamtemp.id})
         response = self.client.get(reset_url, follow=True)
         self.assertDoesLoginRedirect(response, redirect_to=reset_url)
+        self.assertIsPasswordForm(response)
 
     def test_admin_reset_team_view(self):
         self.setUpAdmin()

diff --git a/teamtemp/tests/view/test_set_view.py b/teamtemp/tests/view/test_set_view.py
@@ -8,7 +8,7 @@ def test_no_admin_set_view(self):
         set_url = reverse('set', kwargs={'survey_id': self.teamtemp.id})
         response = self.client.get(set_url, follow=True)
         self.assertDoesLoginRedirect(response, redirect_to=set_url)
-
+        self.assertIsPasswordForm(response)
 
     def test_admin_set_view(self):
         self.setUpAdmin()

diff --git a/teamtemp/tests/view/test_team_view.py b/teamtemp/tests/view/test_team_view.py
@@ -8,6 +8,7 @@ def test_no_admin_existing_team_view(self):
         team_url = reverse('team', kwargs={'survey_id': self.teamtemp.id, 'team_name': self.team.team_name})
         response = self.client.get(team_url, follow=True)
         self.assertDoesLoginRedirect(response, redirect_to=team_url)
+        self.assertIsPasswordForm(response)
 
     def test_admin_existing_team_view(self):
         self.setUpAdmin()