aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/tests/description.py
diff options
context:
space:
mode:
authorTom Christie2011-05-24 10:27:24 +0100
committerTom Christie2011-05-24 10:27:24 +0100
commit370274f5640d55ef71422f7a2440710a43ff900e (patch)
tree2b970d3e1ad6d283050139bfe7a914bf10586963 /djangorestframework/tests/description.py
parent698df527a3b80edbf4278ea52e88c1699b2f2256 (diff)
downloaddjango-rest-framework-370274f5640d55ef71422f7a2440710a43ff900e.tar.bz2
Allow views to return HttpResponses. Add initial() hook method
Diffstat (limited to 'djangorestframework/tests/description.py')
-rw-r--r--djangorestframework/tests/description.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/djangorestframework/tests/description.py b/djangorestframework/tests/description.py
index 6c494efa..1ce29112 100644
--- a/djangorestframework/tests/description.py
+++ b/djangorestframework/tests/description.py
@@ -1,5 +1,5 @@
from django.test import TestCase
-from djangorestframework.views import BaseView
+from djangorestframework.views import View
from djangorestframework.compat import apply_markdown
from djangorestframework.utils.description import get_name, get_description
@@ -35,7 +35,7 @@ MARKED_DOWN = """<h2>an example docstring</h2>
class TestViewNamesAndDescriptions(TestCase):
def test_resource_name_uses_classname_by_default(self):
"""Ensure Resource names are based on the classname by default."""
- class MockView(BaseView):
+ class MockView(View):
pass
self.assertEquals(get_name(MockView()), 'Mock')
@@ -43,13 +43,13 @@ class TestViewNamesAndDescriptions(TestCase):
#def test_resource_name_can_be_set_explicitly(self):
# """Ensure Resource names can be set using the 'name' class attribute."""
# example = 'Some Other Name'
- # class MockView(BaseView):
+ # class MockView(View):
# name = example
# self.assertEquals(get_name(MockView()), example)
def test_resource_description_uses_docstring_by_default(self):
"""Ensure Resource names are based on the docstring by default."""
- class MockView(BaseView):
+ class MockView(View):
"""an example docstring
====================
@@ -71,7 +71,7 @@ class TestViewNamesAndDescriptions(TestCase):
#def test_resource_description_can_be_set_explicitly(self):
# """Ensure Resource descriptions can be set using the 'description' class attribute."""
# example = 'Some other description'
- # class MockView(BaseView):
+ # class MockView(View):
# """docstring"""
# description = example
# self.assertEquals(get_description(MockView()), example)
@@ -79,13 +79,13 @@ class TestViewNamesAndDescriptions(TestCase):
#def test_resource_description_does_not_require_docstring(self):
# """Ensure that empty docstrings do not affect the Resource's description if it has been set using the 'description' class attribute."""
# example = 'Some other description'
- # class MockView(BaseView):
+ # class MockView(View):
# description = example
# self.assertEquals(get_description(MockView()), example)
def test_resource_description_can_be_empty(self):
"""Ensure that if a resource has no doctring or 'description' class attribute, then it's description is the empty string"""
- class MockView(BaseView):
+ class MockView(View):
pass
self.assertEquals(get_description(MockView()), '')