diff options
Diffstat (limited to 'djangorestframework/tests/reverse.py')
| -rw-r--r-- | djangorestframework/tests/reverse.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py index 2718ebca..63e2080a 100644 --- a/djangorestframework/tests/reverse.py +++ b/djangorestframework/tests/reverse.py @@ -5,12 +5,16 @@ from django.utils import simplejson as json from djangorestframework.resource import Resource +<<<<<<< local + +======= +>>>>>>> other class MockResource(Resource): """Mock resource which simply returns a URL, so that we can ensure that reversed URLs are fully qualified""" - anon_allowed_methods = ('GET',) + permissions = () - def get(self, request, auth): + def get(self, request): return reverse('another') urlpatterns = patterns('', @@ -24,5 +28,9 @@ class ReverseTests(TestCase): urls = 'djangorestframework.tests.reverse' def test_reversed_urls_are_fully_qualified(self): - response = self.client.get('/') + try: + response = self.client.get('/') + except: + import traceback + traceback.print_exc() self.assertEqual(json.loads(response.content), 'http://testserver/another') |