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

Python 3: multi-lined assertIn, assertNotIn -> assertContains, assertNotContains

Browse Source
This commit is contained in:
Nimisha Asthagiri
2019-09-29 00:22:48 -04:00
parent beb95eb69c
commit 9bbc21ea8c
20 changed files with 93 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/djangoapps/instructor/tests/test_api.py
View File

@@ -869,7 +869,7 @@ class TestInstructorAPIBulkAccountCreationAndEnrollment(SharedModuleStoreTestCas
user.is_active = False
user.save()
csv_content = b"{email},{username},tester,USA".format(email=conflicting_email, username='new_test_student')
csv_content = "{email},{username},tester,USA".format(email=conflicting_email, username='new_test_student')
uploaded_file = SimpleUploadedFile("temp.csv", six.b(csv_content))
response = self.client.post(self.url, {'students_list': uploaded_file})
self.assertEqual(response.status_code, 200)
@@ -2673,9 +2673,10 @@ class TestInstructorAPILevelsDataDump(SharedModuleStoreTestCase, LoginEnrollment
# Now invalidate the same invoice number and expect an Bad request
response = self.assert_request_status_code(400, url, method="POST", data=data)
self.assertIn(
self.assertContains(
response,
"The sale associated with this invoice has already been invalidated.",
response.content.decode('utf-8')
status_code=400,
)
# now re_validate the invoice number
@@ -5171,7 +5172,6 @@ class TestCourseRegistrationCodes(SharedModuleStoreTestCase):
}
response = self.client.post(generate_code_url, data, **{'HTTP_HOST': 'localhost'})
self.assertEqual(response.status_code, 400, response.content.decode('utf-8'))
self.assertContains(response, 'Could not parse amount as', status_code=400)
def test_get_historical_coupon_codes(self):

8
lms/djangoapps/instructor/tests/test_spoc_gradebook.py
View File

@@ -136,10 +136,10 @@ class TestLetterCutoffPolicy(TestGradebook):
def test_styles(self):
self.assertIn(u"grade_A {color:green;}", self.response.content.decode(self.response.charset))
self.assertIn(u"grade_B {color:Chocolate;}", self.response.content.decode(self.response.charset))
self.assertIn(u"grade_C {color:DarkSlateGray;}", self.response.content.decode(self.response.charset))
self.assertIn(u"grade_D {color:DarkSlateGray;}", self.response.content.decode(self.response.charset))
self.assertContains(self.response, u"grade_A {color:green;}")
self.assertContains(self.response, u"grade_B {color:Chocolate;}")
self.assertContains(self.response, u"grade_C {color:DarkSlateGray;}")
self.assertContains(self.response, u"grade_D {color:DarkSlateGray;}")
def test_assigned_grades(self):
# Users 9-10 have >= 90% on Homeworks [2]

2
lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
View File

@@ -323,7 +323,7 @@ class TestInstructorDashboard(ModuleStoreTestCase, LoginEnrollmentTestCase, XssT
self.assertContains(response, '<th scope="row">Professional</th>')
# dashboard link hidden
self.assertNotIn(self.get_dashboard_enrollment_message(), response.content.decode(response.charset))
self.assertNotContains(response, self.get_dashboard_enrollment_message())
@patch.dict(settings.FEATURES, {'DISPLAY_ANALYTICS_ENROLLMENTS': True})
@override_settings(ANALYTICS_DASHBOARD_URL='')