From 6dc5cb498ea7e73adc4d0563ba3cdc696f7133b0 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Thu, 22 Jun 2017 11:08:54 -0400
Subject: [PATCH] Put the verification-sock html on the page all the time so
 that we can easily experiment on it with optimizely

---
 .../course-sock-fragment.html                 | 12 ++++---
 .../tests/views/test_course_sock.py           | 32 ++++++++++++-------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html b/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html
index f0fb39a40f..6025b33d96 100644
--- a/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html
+++ b/openedx/features/course_experience/templates/course_experience/course-sock-fragment.html
@@ -9,8 +9,12 @@ from openedx.features.course_experience import DISPLAY_COURSE_SOCK_FLAG
 %>
 
 <%block name="content">
-    % if show_course_sock and DISPLAY_COURSE_SOCK_FLAG.is_enabled(course_id):
-    <div class="verification-sock">
+    % if show_course_sock:
+    <div class="verification-sock"
+        % if not DISPLAY_COURSE_SOCK_FLAG.is_enabled(course_id):
+        style="display: none"
+        %endif
+    >
         <button type="button" class="btn btn-brand focusable action-toggle-verification-sock">
             Learn About Verified Certificate
         </button>
@@ -46,7 +50,7 @@ from openedx.features.course_experience import DISPLAY_COURSE_SOCK_FLAG
                     <div class="story-quote">
                         I wanted to include a verified certificate on my resume and my profile to
                         illustrate that I am working towards this goal I have and that I have
-                        achieved something while I was unemployed.</br>
+                        achieved something while I was unemployed.<br/>
                         <span class="author">- Cheryl Troell, edX Learner</span>
                     </div>
                 </div>
@@ -59,7 +63,7 @@ from openedx.features.course_experience import DISPLAY_COURSE_SOCK_FLAG
             </div>
         </div>
     </div>
-    % endif
+    %endif
 </%block>
 
 <%static:webpack entry="CourseSock">
diff --git a/openedx/features/course_experience/tests/views/test_course_sock.py b/openedx/features/course_experience/tests/views/test_course_sock.py
index 919865b547..2f8b59ec39 100644
--- a/openedx/features/course_experience/tests/views/test_course_sock.py
+++ b/openedx/features/course_experience/tests/views/test_course_sock.py
@@ -4,8 +4,10 @@ Tests for course verification sock
 
 import datetime
 import ddt
+from django.template.loader import render_to_string
 
 from course_modes.models import CourseMode
+from courseware.views.views import get_course_prices
 from openedx.core.djangoapps.waffle_utils.testutils import override_waffle_flag
 from openedx.features.course_experience import DISPLAY_COURSE_SOCK_FLAG
 from student.tests.factories import UserFactory, CourseEnrollmentFactory
@@ -14,7 +16,7 @@ from xmodule.modulestore.tests.factories import CourseFactory
 from .test_course_home import course_home_url
 
 TEST_PASSWORD = 'test'
-TEST_VERIFICATION_SOCK_LOCATOR = '<div class="verification-sock">'
+TEST_VERIFICATION_SOCK_LOCATOR = '<div class="verification-sock"'
 TEST_COURSE_PRICE = 50
 
 
@@ -58,8 +60,7 @@ class TestCourseSockView(SharedModuleStoreTestCase):
         not have a visible verification sock.
         """
         response = self.client.get(course_home_url(self.standard_course))
-        self.assertEqual(self.is_verified_sock_visible(response), False,
-                         'Student should not be able to see sock in a unverifiable course.')
+        self.assert_verified_sock_is_not_visible(self.standard_course, response)
 
     @override_waffle_flag(DISPLAY_COURSE_SOCK_FLAG, active=True)
     def test_verified_course(self):
@@ -68,8 +69,7 @@ class TestCourseSockView(SharedModuleStoreTestCase):
         visible verification sock.
         """
         response = self.client.get(course_home_url(self.verified_course))
-        self.assertEqual(self.is_verified_sock_visible(response), True,
-                         'Student should be able to see sock in a verifiable course.')
+        self.assert_verified_sock_is_visible(self.verified_course, response)
 
     @override_waffle_flag(DISPLAY_COURSE_SOCK_FLAG, active=True)
     def test_verified_course_updated_expired(self):
@@ -78,8 +78,7 @@ class TestCourseSockView(SharedModuleStoreTestCase):
         date does not display the verification sock.
         """
         response = self.client.get(course_home_url(self.verified_course_update_expired))
-        self.assertEqual(self.is_verified_sock_visible(response), False,
-                         'Student should be able to see sock in a verifiable course if the update expiration date has passed.')
+        self.assert_verified_sock_is_not_visible(self.verified_course_update_expired, response)
 
     @override_waffle_flag(DISPLAY_COURSE_SOCK_FLAG, active=True)
     def test_verified_course_user_already_upgraded(self):
@@ -88,12 +87,21 @@ class TestCourseSockView(SharedModuleStoreTestCase):
         verified status cannot see the verification sock.
         """
         response = self.client.get(course_home_url(self.verified_course_already_enrolled))
-        self.assertEqual(self.is_verified_sock_visible(response), False,
-                         'Student should be able to see sock if they have already upgraded to verified mode.')
+        self.assert_verified_sock_is_not_visible(self.verified_course_already_enrolled, response)
 
-    @classmethod
-    def is_verified_sock_visible(cls, response):
-        return TEST_VERIFICATION_SOCK_LOCATOR in response.content
+    def assert_verified_sock_is_visible(self, course, response):
+        return self.assertIn(
+            TEST_VERIFICATION_SOCK_LOCATOR,
+            response.content,
+            msg='Student should be able to see sock if they have already upgraded to verified mode.',
+        )
+
+    def assert_verified_sock_is_not_visible(self, course, response):
+        return self.assertNotIn(
+            TEST_VERIFICATION_SOCK_LOCATOR,
+            response.content,
+            msg='Student should not be able to see sock in a unverifiable course.',
+        )
 
     @classmethod
     def _add_course_mode(cls, course, upgrade_deadline_expired=False):