Merge pull request #5111 from edx/shib-tests-ddt

Use ddt for shib tests

common/djangoapps/external_auth/tests/test_shib.py

@@ -5,6 +5,7 @@ Tests for Shibboleth Authentication
 """
 import unittest
 from mock import patch
+from ddt import ddt, data
 
 from django.conf import settings
 from django.http import HttpResponseRedirect
@@ -74,6 +75,7 @@ def gen_all_identities():
                     yield _build_identity_dict(mail, display_name, given_name, surname)
 
 
+@ddt
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE, SESSION_ENGINE='django.contrib.sessions.backends.cache')
 class ShibSPTest(ModuleStoreTestCase):
     """
@@ -271,13 +273,13 @@ class ShibSPTest(ModuleStoreTestCase):
         self._base_test_extauth_auto_activate_user_with_flag(log_user_string="user.id: 1")
 
     @unittest.skipUnless(settings.FEATURES.get('AUTH_USE_SHIB'), "AUTH_USE_SHIB not set")
-    def test_registration_form(self):
+    @data(*gen_all_identities())
+    def test_registration_form(self, identity):
         """
         Tests the registration form showing up with the proper parameters.
 
         Uses django test client for its session support
         """
-        for identity in gen_all_identities():
         client = DjangoTestClient()
         # identity k/v pairs will show up in request.META
         response = client.get(path='/shib-login/', data={}, follow=False, **identity)
@@ -297,11 +299,9 @@ class ShibSPTest(ModuleStoreTestCase):
         else:
             self.assertNotContains(response, fullname_input_html)
 
-            # clean up b/c we don't want existing ExternalAuthMap for the next run
-            client.session['ExternalAuthMap'].delete()
-
     @unittest.skipUnless(settings.FEATURES.get('AUTH_USE_SHIB'), "AUTH_USE_SHIB not set")
-    def test_registration_form_submit(self):
+    @data(*gen_all_identities())
+    def test_registration_form_submit(self, identity):
         """
         Tests user creation after the registration form that pops is submitted.  If there is no shib
         ExternalAuthMap in the session, then the created user should take the username and email from the
@@ -309,7 +309,6 @@ class ShibSPTest(ModuleStoreTestCase):
 
         Uses django test client for its session support
         """
-        for identity in gen_all_identities():
         # First we pop the registration form
         client = DjangoTestClient()
         response1 = client.get(path='/shib-login/', data={}, follow=False, **identity)
@@ -379,14 +378,9 @@ class ShibSPTest(ModuleStoreTestCase):
             self.assertEqual(profile.name, request2.session['ExternalAuthMap'].external_name)
             self.assertEqual(profile.name, identity.get('displayName').decode('utf-8'))
 
-            # clean up for next loop
-            request2.session['ExternalAuthMap'].delete()
-            UserProfile.objects.filter(user=user).delete()
-            Registration.objects.filter(user=user).delete()
-            user.delete()
-
     @unittest.skipUnless(settings.FEATURES.get('AUTH_USE_SHIB'), "AUTH_USE_SHIB not set")
-    def test_course_specific_login_and_reg(self):
+    @data("", "shib:https://idp.stanford.edu/")
+    def test_course_specific_login_and_reg(self, domain):
         """
         Tests that the correct course specific login and registration urls work for shib
         """
@@ -398,7 +392,6 @@ class ShibSPTest(ModuleStoreTestCase):
         )
 
         # Test for cases where course is found
-        for domain in ["", "shib:https://idp.stanford.edu/"]:
         # set domains
 
         # temporarily set the branch to draft-preferred so we can update the course
@@ -530,8 +523,6 @@ class ShibSPTest(ModuleStoreTestCase):
                 if course is open_enroll_course or student is shib_student:
                     self.assertEqual(response.status_code, 200)
                     self.assertTrue(CourseEnrollment.is_enrolled(student, course.id))
-                    # Clean up
-                    CourseEnrollment.unenroll(student, course.id)
                 else:
                     self.assertEqual(response.status_code, 400)
                     self.assertFalse(CourseEnrollment.is_enrolled(student, course.id))