diff options
| author | Philip Douglas | 2013-07-31 07:45:05 -0700 |
|---|---|---|
| committer | Philip Douglas | 2013-07-31 07:45:05 -0700 |
| commit | c058ab36b13a6979c57760d9af2eb21ec3165e7d (patch) | |
| tree | 9c352f0ebaddf18b03e45de9bf4ee3ad53377e17 /rest_framework/tests/test_routers.py | |
| parent | bf8e71c455a47a53898f8239ac7dad47e5f1d53a (diff) | |
| parent | 43a5f8183c90f1056bbf33bb1402e76883aeb1fd (diff) | |
| download | django-rest-framework-c058ab36b13a6979c57760d9af2eb21ec3165e7d.tar.bz2 | |
Merge pull request #2 from tomchristie/master
Update to latest
Diffstat (limited to 'rest_framework/tests/test_routers.py')
| -rw-r--r-- | rest_framework/tests/test_routers.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py index d375f4a8..5fcccb74 100644 --- a/rest_framework/tests/test_routers.py +++ b/rest_framework/tests/test_routers.py @@ -1,15 +1,15 @@ from __future__ import unicode_literals from django.db import models from django.test import TestCase -from django.test.client import RequestFactory from django.core.exceptions import ImproperlyConfigured from rest_framework import serializers, viewsets, permissions from rest_framework.compat import include, patterns, url from rest_framework.decorators import link, action from rest_framework.response import Response from rest_framework.routers import SimpleRouter, DefaultRouter +from rest_framework.test import APIRequestFactory -factory = RequestFactory() +factory = APIRequestFactory() urlpatterns = patterns('',) @@ -193,6 +193,7 @@ class TestActionKeywordArgs(TestCase): {'permission_classes': [permissions.AllowAny]} ) + class TestActionAppliedToExistingRoute(TestCase): """ Ensure `@action` decorator raises an except when applied |
