merged + fixed broken test

1 files changed, 0 insertions, 14 deletions

diff --git a/djangorestframework/tests/views.py b/djangorestframework/tests/views.py
index ab5d75d6..d4189087 100644
--- a/djangorestframework/tests/views.py
+++ b/djangorestframework/tests/views.py
@@ -46,8 +46,6 @@ class MockResource(ModelResource):
     fields = ('foo', 'bar', 'baz')
 
 urlpatterns = patterns('djangorestframework.utils.staticviews',
-    url(r'^robots.txt$', 'deny_robots'),
-    url(r'^favicon.ico$', 'favicon'),
     url(r'^accounts/login$', 'api_login'),
     url(r'^accounts/logout$', 'api_logout'),
     url(r'^mock/$', MockView.as_view()),
@@ -123,18 +121,6 @@ class ExtraViewsTests(TestCase):
     """Test the extra views djangorestframework provides"""
     urls = 'djangorestframework.tests.views'
 
-    def test_robots_view(self):
-        """Ensure the robots view exists"""
-        response = self.client.get('/robots.txt')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response['Content-Type'], 'text/plain')
-
-    def test_favicon_view(self):
-        """Ensure the favicon view exists"""
-        response = self.client.get('/favicon.ico')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response['Content-Type'], 'image/vnd.microsoft.icon')
-
     def test_login_view(self):
         """Ensure the login view exists"""
         response = self.client.get('/accounts/login')