diff --git a/lms/djangoapps/api_manager/groups/tests.py b/lms/djangoapps/api_manager/groups/tests.py index 0a6cb1d..826a692 100644 --- a/lms/djangoapps/api_manager/groups/tests.py +++ b/lms/djangoapps/api_manager/groups/tests.py @@ -895,9 +895,6 @@ class GroupsApiTests(ModuleStoreTestCase): response = self.do_post(self.base_groups_uri, data) self.assertEqual(response.status_code, 201) test_uri = response.data['uri'] + '/courses' - data = {'course_id': "slashes:invalid+course+id"} - response = self.do_post(test_uri, data) - self.assertEqual(response.status_code, 404) data = {'course_id': "invalid/course/id"} response = self.do_post(test_uri, data) self.assertEqual(response.status_code, 404) diff --git a/lms/djangoapps/api_manager/users/tests.py b/lms/djangoapps/api_manager/users/tests.py index e9270e0..aebc323 100644 --- a/lms/djangoapps/api_manager/users/tests.py +++ b/lms/djangoapps/api_manager/users/tests.py @@ -757,7 +757,7 @@ class UsersApiTests(ModuleStoreTestCase): response = self.do_post(test_uri, data) user_id = response.data['id'] test_uri = '{}/{}/courses'.format(test_uri, str(user_id)) - data = {'course_id': 'slashes:234asdfapsdf+2sdfs+sdf'} + data = {'course_id': '234asdfapsdf/2sdfs/sdf'} response = self.do_post(test_uri, data) self.assertEqual(response.status_code, 404) data = {'course_id': 'really-invalid-course-id-oh-boy-watch-out'} @@ -1081,7 +1081,7 @@ class UsersApiTests(ModuleStoreTestCase): self.assertEqual(response.status_code, 204) def test_user_course_grades_course_not_found(self): - test_uri = '{}/{}/courses/slashes:some+unknown+course/grades'.format(self.users_base_uri, self.user.id) + test_uri = '{}/{}/courses/some/unknown/course/grades'.format(self.users_base_uri, self.user.id) response = self.do_get(test_uri) self.assertEqual(response.status_code, 404) diff --git a/lms/djangoapps/gradebook/management/commands/generate_gradebook_entries.py b/lms/djangoapps/gradebook/management/commands/generate_gradebook_entries.py index 22c0350..b8f89ee 100644 --- a/lms/djangoapps/gradebook/management/commands/generate_gradebook_entries.py +++ b/lms/djangoapps/gradebook/management/commands/generate_gradebook_entries.py @@ -28,7 +28,7 @@ class Command(BaseCommand): "--course_ids", dest="course_ids", help="List of courses for which to generate grades", - metavar="slashes:first+course+id,slashes:second+course+id" + metavar="first/course/id,second/course/id" ), make_option( "-u", diff --git a/lms/djangoapps/gradebook/management/commands/tests/test_generate_gradebook_entries.py b/lms/djangoapps/gradebook/management/commands/tests/test_generate_gradebook_entries.py index 3b1183c..1b6ca5f 100644 --- a/lms/djangoapps/gradebook/management/commands/tests/test_generate_gradebook_entries.py +++ b/lms/djangoapps/gradebook/management/commands/tests/test_generate_gradebook_entries.py @@ -136,7 +136,7 @@ class GenerateGradebookEntriesTests(ModuleStoreTestCase): Test the gradebook entry generator """ # Set up the command context - course_ids = '{},slashes:bogus+course+id'.format(self.course.id) + course_ids = '{},bogus/course/id'.format(self.course.id) user_ids = '{}'.format(self.users[0].id) current_entries = StudentGradebook.objects.all() self.assertEqual(len(current_entries), 0) diff --git a/lms/djangoapps/progress/management/commands/generate_progress_entries.py b/lms/djangoapps/progress/management/commands/generate_progress_entries.py index bd02b75..b060669 100644 --- a/lms/djangoapps/progress/management/commands/generate_progress_entries.py +++ b/lms/djangoapps/progress/management/commands/generate_progress_entries.py @@ -29,7 +29,7 @@ class Command(BaseCommand): "--course_ids", dest="course_ids", help="List of courses for which to generate progress", - metavar="slashes:first+course+id,slashes:second+course+id" + metavar="first/course/id,second/course/id" ), make_option( "-u", diff --git a/lms/djangoapps/progress/management/commands/tests/test_generate_progress_entries.py b/lms/djangoapps/progress/management/commands/tests/test_generate_progress_entries.py index 77278ca..b4b0e83 100644 --- a/lms/djangoapps/progress/management/commands/tests/test_generate_progress_entries.py +++ b/lms/djangoapps/progress/management/commands/tests/test_generate_progress_entries.py @@ -106,7 +106,7 @@ class GenerateProgressEntriesTests(ModuleStoreTestCase): Test the progress entry generator """ # Set up the command context - course_ids = '{},slashes:bogus+course+id'.format(self.course.id) + course_ids = '{},bogus/course/id'.format(self.course.id) user_ids = '{}'.format(self.users[0].id) current_entries = StudentProgress.objects.all() self.assertEqual(len(current_entries), 0)