From f26e88bdd95daa7e8e6b8331127ee26289142261 Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Tue, 19 Aug 2014 07:53:26 -0400
Subject: [PATCH] Fix messaging for professional ed under auto-registration

---
 .../verify_student/tests/test_integration.py  | 34 ++++++++++++++++---
 .../verify_student/_verification_header.html  |  2 ++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/verify_student/tests/test_integration.py b/lms/djangoapps/verify_student/tests/test_integration.py
index 1062eda8a1..5c69b911d0 100644
--- a/lms/djangoapps/verify_student/tests/test_integration.py
+++ b/lms/djangoapps/verify_student/tests/test_integration.py
@@ -5,18 +5,22 @@ Integration tests of the payment flow, including course mode selection.
 from lxml.html import soupparser
 from django.test.utils import override_settings
 from django.core.urlresolvers import reverse
-
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from django.conf import settings
 
 from xmodule.modulestore.tests.factories import CourseFactory
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, mixed_store_config
 from student.tests.factories import UserFactory
+from student.models import CourseEnrollment
 from course_modes.tests.factories import CourseModeFactory
-from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from verify_student.models import SoftwareSecurePhotoVerification
 
 
-@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
+# Since we don't need any XML course fixtures, use a modulestore configuration
+# that disables the XML modulestore.
+MODULESTORE_CONFIG = mixed_store_config(settings.COMMON_TEST_DATA_ROOT, {}, include_xml=False)
+
+
+@override_settings(MODULESTORE=MODULESTORE_CONFIG)
 class TestProfEdVerification(ModuleStoreTestCase):
     """
     Integration test for professional ed verification, including course mode selection.
@@ -95,6 +99,26 @@ class TestProfEdVerification(ModuleStoreTestCase):
         # On the verified page, expect that there's a link to payment page
         self.assertContains(resp, '/shoppingcart/payment_fake')
 
+    def test_do_not_auto_register(self):
+        # TODO (ECOM-16): Remove once we complete the AB-test of auto-registration.
+        session = self.client.session
+        session['auto_register'] = True
+        session.save()
+
+        # Go to the course mode page, expecting a redirect
+        # to the show requirements page.
+        resp = self.client.get(self.urls['course_modes_choose'], follow=True)
+        self.assertRedirects(resp, self.urls['verify_show_student_requirements'])
+
+        # For professional ed courses, expect that the student is NOT enrolled
+        # automatically in the course.
+        self.assertFalse(CourseEnrollment.is_enrolled(self.user, self.course_key))
+
+        # Expect that the rendered page says that the student is "registering",
+        # not that they've already been registered.
+        self.assertIn("You are registering for", resp.content)
+        self.assertNotIn("You are now registered", resp.content)
+
     def _prices_on_page(self, page_content):
         """ Retrieve the available prices on the verify page. """
         html = soupparser.fromstring(page_content)
diff --git a/lms/templates/verify_student/_verification_header.html b/lms/templates/verify_student/_verification_header.html
index 0aedca7242..39a33e76eb 100644
--- a/lms/templates/verify_student/_verification_header.html
+++ b/lms/templates/verify_student/_verification_header.html
@@ -46,6 +46,8 @@
         <span class="sts-label">${_("You are upgrading your registration for")}</span>
       %elif reverify:
         <span class="sts-label">${_("You are re-verifying for")}</span>
+      %elif modes_dict and "professional" in modes_dict:
+        <span class="sts-label">${_("You are registering for")}</span>
       %else:
         <span class="sts-label">${_("Congrats! You are now registered to audit")}</span>
       %endif