Improve throttles and docs

1 files changed, 14 insertions, 14 deletions

diff --git a/djangorestframework/tests/throttling.py b/djangorestframework/tests/throttling.py
index d144d956..9ee4ffa4 100644
--- a/djangorestframework/tests/throttling.py
+++ b/djangorestframework/tests/throttling.py
@@ -8,24 +8,30 @@ from django.core.cache import cache
 
 from djangorestframework.compat import RequestFactory
 from djangorestframework.views import APIView
-from djangorestframework.throttling import PerUserThrottling, PerViewThrottling
+from djangorestframework.throttling import UserRateThrottle
 from djangorestframework.response import Response
 
 
-class MockView(APIView):
-    throttle_classes = (PerUserThrottling,)
+class User3SecRateThrottle(UserRateThrottle):
     rate = '3/sec'
 
+
+class User3MinRateThrottle(UserRateThrottle):
+    rate = '3/min'
+
+
+class MockView(APIView):
+    throttle_classes = (User3SecRateThrottle,)
+
     def get(self, request):
         return Response('foo')
 
 
-class MockView_PerViewThrottling(MockView):
-    throttle_classes = (PerViewThrottling,)
+class MockView_MinuteThrottling(APIView):
+    throttle_classes = (User3MinRateThrottle,)
 
-
-class MockView_MinuteThrottling(MockView):
-    rate = '3/min'
+    def get(self, request):
+        return Response('foo')
 
 
 class ThrottlingTests(TestCase):
@@ -86,12 +92,6 @@ class ThrottlingTests(TestCase):
         """
         self.ensure_is_throttled(MockView, 200)
 
-    def test_request_throttling_is_per_view(self):
-        """
-        Ensure request rate is limited globally per View for PerViewThrottles
-        """
-        self.ensure_is_throttled(MockView_PerViewThrottling, 429)
-
     def ensure_response_header_contains_proper_throttle_field(self, view, expected_headers):
         """
         Ensure the response returns an X-Throttle field with status and next attributes