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 c4cebe8b1d..cc31250d45 100644 --- a/openedx/features/course_experience/tests/views/test_course_sock.py +++ b/openedx/features/course_experience/tests/views/test_course_sock.py @@ -4,6 +4,7 @@ Tests for course verification sock import ddt +from commerce.models import CommerceConfiguration from course_modes.models import CourseMode from openedx.core.djangoapps.waffle_utils.testutils import override_waffle_flag from openedx.features.course_experience import DISPLAY_COURSE_SOCK_FLAG @@ -50,6 +51,8 @@ class TestCourseSockView(SharedModuleStoreTestCase): user=self.user, course_id=self.verified_course_already_enrolled.id, mode=CourseMode.VERIFIED ) + CommerceConfiguration.objects.create(enabled=True, checkout_on_ecommerce_service=True) + # Log the user in self.client.login(username=self.user.username, password=TEST_PASSWORD) @@ -90,15 +93,7 @@ class TestCourseSockView(SharedModuleStoreTestCase): self.assert_verified_sock_is_not_visible(self.verified_course_already_enrolled, response) 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.', - ) + return self.assertContains(response, TEST_VERIFICATION_SOCK_LOCATOR, html=False) 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.', - ) + return self.assertNotContains(response, TEST_VERIFICATION_SOCK_LOCATOR, html=False) diff --git a/openedx/features/course_experience/views/course_sock.py b/openedx/features/course_experience/views/course_sock.py index e708511c1e..d9c25e7724 100644 --- a/openedx/features/course_experience/views/course_sock.py +++ b/openedx/features/course_experience/views/course_sock.py @@ -27,8 +27,12 @@ class CourseSockFragmentView(EdxFragmentView): def get_verification_context(request, course): enrollment = CourseEnrollment.get_enrollment(request.user, course.id) show_course_sock = verified_upgrade_link_is_valid(enrollment) and get_language() == 'en' - upgrade_url = verified_upgrade_deadline_link(request.user, course=course) - course_price = get_cosmetic_verified_display_price(course) + if show_course_sock: + upgrade_url = verified_upgrade_deadline_link(request.user, course=course) + course_price = get_cosmetic_verified_display_price(course) + else: + upgrade_url = '' + course_price = '' context = { 'show_course_sock': show_course_sock,