From 5d356d29bd4ae099152be46c77c9ee1ed6d65a46 Mon Sep 17 00:00:00 2001 From: Clinton Blackburn Date: Tue, 7 Jul 2015 11:47:45 -0400 Subject: [PATCH] Corrected path to Commerce API XCOM-312 --- lms/djangoapps/commerce/api/v1/tests/test_views.py | 10 +++++----- lms/djangoapps/commerce/urls.py | 1 - lms/urls.py | 2 ++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lms/djangoapps/commerce/api/v1/tests/test_views.py b/lms/djangoapps/commerce/api/v1/tests/test_views.py index 97103ca76a..6dc7606258 100644 --- a/lms/djangoapps/commerce/api/v1/tests/test_views.py +++ b/lms/djangoapps/commerce/api/v1/tests/test_views.py @@ -41,7 +41,7 @@ class CourseApiViewTestMixin(object): class CourseListViewTests(CourseApiViewTestMixin, ModuleStoreTestCase): """ Tests for CourseListView. """ - path = reverse('commerce:api:v1:courses:list') + path = reverse('commerce_api:v1:courses:list') def test_authentication_required(self): """ Verify only authenticated users can access the view. """ @@ -72,7 +72,7 @@ class CourseRetrieveUpdateViewTests(CourseApiViewTestMixin, ModuleStoreTestCase) def setUp(self): super(CourseRetrieveUpdateViewTests, self).setUp() - self.path = reverse('commerce:api:v1:courses:retrieve_update', args=[unicode(self.course.id)]) + self.path = reverse('commerce_api:v1:courses:retrieve_update', args=[unicode(self.course.id)]) self.user = UserFactory.create() self.client.login(username=self.user.username, password=PASSWORD) @@ -103,7 +103,7 @@ class CourseRetrieveUpdateViewTests(CourseApiViewTestMixin, ModuleStoreTestCase) def test_retrieve_invalid_course(self): """ The view should return HTTP 404 when retrieving data for a course that does not exist. """ - path = reverse('commerce:api:v1:courses:retrieve_update', args=['a/b/c']) + path = reverse('commerce_api:v1:courses:retrieve_update', args=['a/b/c']) response = self.client.get(path, content_type=JSON_CONTENT_TYPE) self.assertEqual(response.status_code, 404) @@ -134,7 +134,7 @@ class CourseRetrieveUpdateViewTests(CourseApiViewTestMixin, ModuleStoreTestCase) u'modes': [self._serialize_course_mode( CourseMode(mode_slug=u'credit', min_price=500, currency=u'USD', sku=u'ABC123')), ] } - path = reverse('commerce:api:v1:courses:retrieve_update', args=[course_id]) + path = reverse('commerce_api:v1:courses:retrieve_update', args=[course_id]) response = self.client.put(path, json.dumps(expected), content_type=JSON_CONTENT_TYPE) self.assertEqual(response.status_code, 200) actual = json.loads(response.content) @@ -156,7 +156,7 @@ class CourseRetrieveUpdateViewTests(CourseApiViewTestMixin, ModuleStoreTestCase) CourseMode(mode_slug=u'honor', min_price=0, currency=u'USD', sku=u'DEADBEEF')), ] } - path = reverse('commerce:api:v1:courses:retrieve_update', args=[course_id]) + path = reverse('commerce_api:v1:courses:retrieve_update', args=[course_id]) response = self.client.put(path, json.dumps(expected), content_type=JSON_CONTENT_TYPE, **request_kwargs) self.assertEqual(response.status_code, 201) actual = json.loads(response.content) diff --git a/lms/djangoapps/commerce/urls.py b/lms/djangoapps/commerce/urls.py index 6f0efe4776..e06fcb2053 100644 --- a/lms/djangoapps/commerce/urls.py +++ b/lms/djangoapps/commerce/urls.py @@ -13,5 +13,4 @@ urlpatterns = patterns( url(r'^baskets/{}/order/$'.format(BASKET_ID_PATTERN), views.BasketOrderView.as_view(), name="basket_order"), url(r'^checkout/cancel/$', views.checkout_cancel, name="checkout_cancel"), url(r'^checkout/receipt/$', views.checkout_receipt, name="checkout_receipt"), - url(r'^api/', include('commerce.api.urls', namespace='api')) ) diff --git a/lms/urls.py b/lms/urls.py index 8199641653..89ce92d010 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -89,6 +89,8 @@ urlpatterns = ( # Video Abstraction Layer used to allow video teams to manage video assets # independently of courseware. https://github.com/edx/edx-val url(r'^api/val/v0/', include('edxval.urls')), + + url(r'^api/commerce/', include('commerce.api.urls', namespace='commerce_api')), ) # Full Course/Library Import/Export API