Commit 5399bf96 by Clinton Blackburn

Added support for URLs both with and without trailing slashes

Change-Id: I49bff504afb2c27c1e98d021540d7447c080a9c3
parent 99dcad6c
...@@ -50,7 +50,7 @@ class CourseActivityLastWeekTest(TestCaseWithAuthentication): ...@@ -50,7 +50,7 @@ class CourseActivityLastWeekTest(TestCaseWithAuthentication):
return default return default
def test_activity_auth(self): def test_activity_auth(self):
response = self.client.get('/api/v0/courses/{0}/recent_activity'.format(self.course_id)) response = self.client.get('/api/v0/courses/{0}/recent_activity'.format(self.course_id), follow=True)
self.assertEquals(response.status_code, 401) self.assertEquals(response.status_code, 401)
def test_url_encoded_course_id(self): def test_url_encoded_course_id(self):
......
...@@ -13,10 +13,7 @@ COURSE_URLS = [ ...@@ -13,10 +13,7 @@ COURSE_URLS = [
('enrollment/gender', CourseEnrollmentByGenderView, 'enrollment_by_gender'), ('enrollment/gender', CourseEnrollmentByGenderView, 'enrollment_by_gender'),
] ]
urlpatterns = patterns( urlpatterns = []
'',
# url(r'^$', CourseDetailView.as_view(), name='detail')
)
for path, view, name in COURSE_URLS: for path, view, name in COURSE_URLS:
urlpatterns += patterns('', url(r'^(?P<course_id>.+)/' + re.escape(path) + r'$', view.as_view(), name=name)) urlpatterns += patterns('', url(r'^(?P<course_id>.+)/' + re.escape(path) + r'/$', view.as_view(), name=name))
...@@ -16,7 +16,7 @@ class TestCaseWithAuthentication(TestCase): ...@@ -16,7 +16,7 @@ class TestCaseWithAuthentication(TestCase):
super(TestCaseWithAuthentication, self).setUp() super(TestCaseWithAuthentication, self).setUp()
test_user = User.objects.create_user('tester', 'test@example.com', 'testpassword') test_user = User.objects.create_user('tester', 'test@example.com', 'testpassword')
token = Token.objects.create(user=test_user) token = Token.objects.create(user=test_user)
self.authenticated_get = partial(self.client.get, HTTP_AUTHORIZATION='Token ' + token.key) self.authenticated_get = partial(self.client.get, HTTP_AUTHORIZATION='Token ' + token.key, follow=True)
@contextmanager @contextmanager
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment