diff options
| author | Christopher Paolini | 2013-08-18 00:29:05 -0400 | 
|---|---|---|
| committer | Christopher Paolini | 2013-08-18 00:29:05 -0400 | 
| commit | 5a374955b14e1f1fdc85f0fa68284dbf6b83ab5f (patch) | |
| tree | 50fc9760d95952b96aca766dd16f2cb8e7e62446 /rest_framework/tests | |
| parent | 11d7c1838a1146728528d762cdf6bf329321c1d1 (diff) | |
| download | django-rest-framework-5a374955b14e1f1fdc85f0fa68284dbf6b83ab5f.tar.bz2 | |
Updated tests for view name and description
Updated the tests to use the default view_name and view_description
functions in the formatter through the default in settings.
Diffstat (limited to 'rest_framework/tests')
| -rw-r--r-- | rest_framework/tests/test_description.py | 9 | 
1 files changed, 4 insertions, 5 deletions
diff --git a/rest_framework/tests/test_description.py b/rest_framework/tests/test_description.py index 8019f5ec..4c03c1de 100644 --- a/rest_framework/tests/test_description.py +++ b/rest_framework/tests/test_description.py @@ -6,7 +6,6 @@ from rest_framework.compat import apply_markdown, smart_text  from rest_framework.views import APIView  from rest_framework.tests.description import ViewWithNonASCIICharactersInDocstring  from rest_framework.tests.description import UTF8_TEST_DOCSTRING -from rest_framework.utils.formatting import get_view_name, get_view_description  # We check that docstrings get nicely un-indented.  DESCRIPTION = """an example docstring @@ -58,7 +57,7 @@ class TestViewNamesAndDescriptions(TestCase):          """          class MockView(APIView):              pass -        self.assertEqual(get_view_name(MockView), 'Mock') +        self.assertEqual(MockView().get_view_name(), 'Mock')      def test_view_description_uses_docstring(self):          """Ensure view descriptions are based on the docstring.""" @@ -78,7 +77,7 @@ class TestViewNamesAndDescriptions(TestCase):              # hash style header #""" -        self.assertEqual(get_view_description(MockView), DESCRIPTION) +        self.assertEqual(MockView().get_view_description(), DESCRIPTION)      def test_view_description_supports_unicode(self):          """ @@ -86,7 +85,7 @@ class TestViewNamesAndDescriptions(TestCase):          """          self.assertEqual( -            get_view_description(ViewWithNonASCIICharactersInDocstring), +            ViewWithNonASCIICharactersInDocstring().get_view_description(),              smart_text(UTF8_TEST_DOCSTRING)          ) @@ -97,7 +96,7 @@ class TestViewNamesAndDescriptions(TestCase):          """          class MockView(APIView):              pass -        self.assertEqual(get_view_description(MockView), '') +        self.assertEqual(MockView().get_view_description(), '')      def test_markdown(self):          """  | 
