From 0fef84a6f2d68dff1ac1e5de54d48ee740868469 Mon Sep 17 00:00:00 2001 From: Julia Hansbrough Date: Thu, 10 Apr 2014 21:22:23 +0000 Subject: [PATCH] fixup! Fix all uses of UsageKeys and CourseKeys, and all of their tests. --- lms/djangoapps/courseware/tests/test_course_info.py | 4 ++-- lms/djangoapps/courseware/tests/test_masquerade.py | 2 +- lms/djangoapps/courseware/tests/test_navigation.py | 2 +- lms/djangoapps/courseware/tests/test_split_module.py | 2 +- lms/djangoapps/courseware/tests/test_views.py | 6 +++--- lms/templates/courseware/course_about.html | 2 +- lms/templates/courseware/instructor_dashboard.html | 4 ++-- lms/templates/courseware/progress.html | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lms/djangoapps/courseware/tests/test_course_info.py b/lms/djangoapps/courseware/tests/test_course_info.py index 07b5d97ca7dc..ba69b94166d1 100644 --- a/lms/djangoapps/courseware/tests/test_course_info.py +++ b/lms/djangoapps/courseware/tests/test_course_info.py @@ -22,13 +22,13 @@ def setUp(self): def test_logged_in(self): self.setup_user() - url = reverse('info', args=[self.course.id]) + url = reverse('info', args=[self.course.id.to_deprecated_string()]) resp = self.client.get(url) self.assertEqual(resp.status_code, 200) self.assertIn("OOGIE BLOOGIE", resp.content) def test_anonymous_user(self): - url = reverse('info', args=[self.course.id]) + url = reverse('info', args=[self.course.id.to_deprecated_string()]) resp = self.client.get(url) self.assertEqual(resp.status_code, 200) self.assertNotIn("OOGIE BLOOGIE", resp.content) diff --git a/lms/djangoapps/courseware/tests/test_masquerade.py b/lms/djangoapps/courseware/tests/test_masquerade.py index ddd6395f9803..db1bd73c5796 100644 --- a/lms/djangoapps/courseware/tests/test_masquerade.py +++ b/lms/djangoapps/courseware/tests/test_masquerade.py @@ -53,7 +53,7 @@ def make_instructor(course): def get_cw_section(self): url = reverse('courseware_section', - kwargs={'course_id': self.graded_course.id, + kwargs={'course_id': self.graded_course.id.to_deprecated_string(), 'chapter': 'GradedChapter', 'section': 'Homework1'}) diff --git a/lms/djangoapps/courseware/tests/test_navigation.py b/lms/djangoapps/courseware/tests/test_navigation.py index 576dbc2bc302..baada1f637d3 100644 --- a/lms/djangoapps/courseware/tests/test_navigation.py +++ b/lms/djangoapps/courseware/tests/test_navigation.py @@ -99,7 +99,7 @@ def test_redirects_second_time(self): })) resp = self.client.get(reverse('courseware', - kwargs={'course_id': self.course.id})) + kwargs={'course_id': self.course.id.to_deprecated_string()})) self.assertRedirects(resp, reverse('courseware_chapter', kwargs={ diff --git a/lms/djangoapps/courseware/tests/test_split_module.py b/lms/djangoapps/courseware/tests/test_split_module.py index 3cad71d133f9..36b000ebca26 100644 --- a/lms/djangoapps/courseware/tests/test_split_module.py +++ b/lms/djangoapps/courseware/tests/test_split_module.py @@ -113,7 +113,7 @@ def _check_split_test(self, user_tag): resp = self.client.get(reverse( 'courseware_section', - kwargs={'course_id': self.course.id, + kwargs={'course_id': self.course.id.to_deprecated_string(), 'chapter': self.chapter.url_name, 'section': self.sequential.url_name} )) diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py index 0e8634014392..c577b068f0d9 100644 --- a/lms/djangoapps/courseware/tests/test_views.py +++ b/lms/djangoapps/courseware/tests/test_views.py @@ -97,7 +97,7 @@ def test_course_about_in_cart(self): in_cart_span = '' # don't mock this course due to shopping cart existence checking course = CourseFactory.create(org="new", number="unenrolled", display_name="course") - request = self.request_factory.get(reverse('about_course', args=[course.id])) + request = self.request_factory.get(reverse('about_course', args=[course.id.to_deprecated_string()])) request.user = AnonymousUser() response = views.course_about(request, course.id.to_deprecated_string()) self.assertEqual(response.status_code, 200) @@ -244,7 +244,7 @@ def test_submission_history_xss(self): # try it with an existing user and a malicious location url = reverse('submission_history', kwargs={ - 'course_id': self.course_id, + 'course_id': self.course_id.to_deprecated_string(), 'student_username': 'dummy', 'location': '' }) @@ -253,7 +253,7 @@ def test_submission_history_xss(self): # try it with a malicious user and a non-existent location url = reverse('submission_history', kwargs={ - 'course_id': self.course_id, + 'course_id': self.course_id.to_deprecated_string(), 'student_username': '', 'location': 'dummy' }) diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html index 2c50e74da536..36a01b079a94 100644 --- a/lms/templates/courseware/course_about.html +++ b/lms/templates/courseware/course_about.html @@ -59,7 +59,7 @@ }; $("#add_to_cart_post").click(function(event){ $.ajax({ - url: "${reverse('add_course_to_cart', args=[course.id])}", + url: "${reverse('add_course_to_cart', args=[course.id.to_deprecated_string()])}", type: "POST", /* Rant: HAD TO USE COMPLETE B/C PROMISE.DONE FOR SOME REASON DOES NOT WORK ON THIS PAGE. */ complete: add_course_complete_handler diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html index 4e6ab4e751ee..f99dbbe19f58 100644 --- a/lms/templates/courseware/instructor_dashboard.html +++ b/lms/templates/courseware/instructor_dashboard.html @@ -187,11 +187,11 @@

${_("Grade Downloads")}

% endif

- ${_("Gradebook")} + ${_("Gradebook")}

- ${_("Grade summary")} + ${_("Grade summary")}

diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html index 6277e06780ef..0d59a437e633 100644 --- a/lms/templates/courseware/progress.html +++ b/lms/templates/courseware/progress.html @@ -60,7 +60,7 @@

${ chapter['display_name'] }

percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 and total > 0 else "" %> -

+

${ section['display_name'] } %if total > 0 or earned > 0: