Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23554 from edx/awais786/BOM-1438

Browse Source 
BOM-1438
This commit is contained in:
Awais Qureshi
2020-04-01 16:07:21 +05:00
committed by GitHub
parent d8774e4f8d 30a2ae8aec
commit 8dfcdc3281
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/djangoapps/commerce/tests/test_views.py
View File

@@ -63,13 +63,17 @@ class ReceiptViewTests(UserMixin, ModuleStoreTestCase):
"""
# Enroll as verified in the course with the current user.
CourseEnrollment.enroll(self.user, self.course.id, mode=CourseMode.VERIFIED)
response = self.client.get(reverse('commerce:user_verification_status'), data={'course_id': self.course.id})
response = self.client.get(
reverse('commerce:user_verification_status'), data={'course_id': str(self.course.id)}
)
json_data = json.loads(response.content.decode('utf-8'))
self.assertEqual(json_data['is_verification_required'], True)
# Enroll as honor in the course with the current user.
CourseEnrollment.enroll(self.user, self.course.id, mode=CourseMode.HONOR)
response = self.client.get(reverse('commerce:user_verification_status'), data={'course_id': self.course.id})
response = self.client.get(
reverse('commerce:user_verification_status'), data={'course_id': str(self.course.id)}
)
json_data = json.loads(response.content.decode('utf-8'))
self.assertEqual(json_data['is_verification_required'], False)

9
lms/djangoapps/support/tests/test_views.py
View File

@@ -308,7 +308,7 @@ class SupportViewEnrollmentsTests(SharedModuleStoreTestCase, SupportViewTestCase
self.assert_enrollment(CourseMode.VERIFIED)
@ddt.data(
({}, r"The field \"'\w+'\" is required."), # The double quoting goes away in Django 2.0.1
({}, r"The field \w+ is required."),
({'course_id': 'bad course key'}, 'Could not parse course key.'),
({
'course_id': 'course-v1:TestX+T101+2015',
@@ -334,10 +334,13 @@ class SupportViewEnrollmentsTests(SharedModuleStoreTestCase, SupportViewTestCase
# `self` isn't available from within the DDT declaration, so
# assign the course ID here
if 'course_id' in data and data['course_id'] is None:
data['course_id'] = six.text_type(self.course.id)
data['course_id'] = str(self.course.id)
response = self.client.post(self.url, data)
self.assertEqual(response.status_code, 400)
self.assertIsNotNone(re.match(error_message, response.content.decode('utf-8')))
self.assertIsNotNone(
re.match(error_message, response.content.decode('utf-8').replace("'", '').replace('"', ''))
)
self.assert_enrollment(CourseMode.AUDIT)
self.assertIsNone(ManualEnrollmentAudit.get_manual_enrollment_by_email(self.student.email))