From 18bbda84b9c663fec6eede112a21cf1a48103303 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 11 Apr 2011 17:13:11 +0100 Subject: depercate auth and content arguments to the request handler methods - yea :) --- djangorestframework/tests/reverse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'djangorestframework/tests/reverse.py') diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py index a862e39a..f6a3ea51 100644 --- a/djangorestframework/tests/reverse.py +++ b/djangorestframework/tests/reverse.py @@ -14,7 +14,7 @@ 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',) - def get(self, request, auth): + def get(self, request): return reverse('another') urlpatterns = patterns('', -- cgit v1.2.3 From 4692374e0d6f020f8a7a95f3a60094d525c59341 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 25 Apr 2011 01:03:23 +0100 Subject: Generic permissions added, allowed_methods and anon_allowed_methods now defunct, dispatch now mirrors View.dispatch more nicely --- djangorestframework/tests/reverse.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'djangorestframework/tests/reverse.py') diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py index f6a3ea51..1f9071b3 100644 --- a/djangorestframework/tests/reverse.py +++ b/djangorestframework/tests/reverse.py @@ -12,7 +12,7 @@ except ImportError: 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): return reverse('another') @@ -28,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') -- cgit v1.2.3 From 762a52edde09297e87c640797219c9bb8255d50a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 25 Apr 2011 04:50:28 +0100 Subject: Fix some compat issues with json/simplejson --- djangorestframework/tests/reverse.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'djangorestframework/tests/reverse.py') diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py index 1f9071b3..28fee63b 100644 --- a/djangorestframework/tests/reverse.py +++ b/djangorestframework/tests/reverse.py @@ -1,13 +1,10 @@ from django.conf.urls.defaults import patterns, url from django.core.urlresolvers import reverse from django.test import TestCase +from django.utils import simplejson as json from djangorestframework.resource import Resource -try: - import json -except ImportError: - import simplejson as json class MockResource(Resource): -- cgit v1.2.3 From b18302586c0eeea2e09c799544b9c0a855e11755 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 27 Apr 2011 18:36:43 +0100 Subject: Urg. Fix broken merging. --- djangorestframework/tests/reverse.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'djangorestframework/tests/reverse.py') diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py index 63e2080a..49939d0e 100644 --- a/djangorestframework/tests/reverse.py +++ b/djangorestframework/tests/reverse.py @@ -5,10 +5,6 @@ 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""" -- cgit v1.2.3 From d373b3a067796b8e181be9368fa24e89c572c45e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 4 May 2011 09:21:17 +0100 Subject: Decouple views and resources --- djangorestframework/tests/reverse.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'djangorestframework/tests/reverse.py') diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py index 49939d0e..7026d4a4 100644 --- a/djangorestframework/tests/reverse.py +++ b/djangorestframework/tests/reverse.py @@ -3,10 +3,10 @@ from django.core.urlresolvers import reverse from django.test import TestCase from django.utils import simplejson as json -from djangorestframework.resource import Resource +from djangorestframework.views import BaseView -class MockResource(Resource): +class MockView(BaseView): """Mock resource which simply returns a URL, so that we can ensure that reversed URLs are fully qualified""" permissions = () @@ -14,8 +14,8 @@ class MockResource(Resource): return reverse('another') urlpatterns = patterns('', - url(r'^$', MockResource.as_view()), - url(r'^another$', MockResource.as_view(), name='another'), + url(r'^$', MockView.as_view()), + url(r'^another$', MockView.as_view(), name='another'), ) -- cgit v1.2.3 From 370274f5640d55ef71422f7a2440710a43ff900e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 24 May 2011 10:27:24 +0100 Subject: Allow views to return HttpResponses. Add initial() hook method --- djangorestframework/tests/reverse.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'djangorestframework/tests/reverse.py') diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py index 7026d4a4..b4b0a793 100644 --- a/djangorestframework/tests/reverse.py +++ b/djangorestframework/tests/reverse.py @@ -3,10 +3,10 @@ from django.core.urlresolvers import reverse from django.test import TestCase from django.utils import simplejson as json -from djangorestframework.views import BaseView +from djangorestframework.views import View -class MockView(BaseView): +class MockView(View): """Mock resource which simply returns a URL, so that we can ensure that reversed URLs are fully qualified""" permissions = () -- cgit v1.2.3