pull in -dev as 0.2.0

1 files changed, 26 insertions, 53 deletions

diff --git a/djangorestframework/tests/methods.py b/djangorestframework/tests/methods.py
index f19bb3e5..d8f0d919 100644
--- a/djangorestframework/tests/methods.py
+++ b/djangorestframework/tests/methods.py
@@ -1,53 +1,26 @@
-# TODO: Refactor these tests
-#from django.test import TestCase
-#from djangorestframework.compat import RequestFactory
-#from djangorestframework.methods import MethodMixin, StandardMethodMixin, OverloadedPOSTMethodMixin
-#
-#
-#class TestMethodMixins(TestCase): 
-#    def setUp(self):
-#        self.req = RequestFactory()
-#
-#    # Interface tests
-#
-#    def test_method_mixin_interface(self):
-#        """Ensure the base ContentMixin interface is as expected."""
-#        self.assertRaises(NotImplementedError, MethodMixin().determine_method, None)
-#
-#    def test_standard_method_mixin_interface(self):
-#        """Ensure the StandardMethodMixin interface is as expected."""
-#        self.assertTrue(issubclass(StandardMethodMixin, MethodMixin))
-#        getattr(StandardMethodMixin, 'determine_method')
-#
-#    def test_overloaded_method_mixin_interface(self):
-#        """Ensure the OverloadedPOSTMethodMixin interface is as expected."""
-#        self.assertTrue(issubclass(OverloadedPOSTMethodMixin, MethodMixin))
-#        getattr(OverloadedPOSTMethodMixin, 'METHOD_PARAM')
-#        getattr(OverloadedPOSTMethodMixin, 'determine_method')
-#
-#    # Behavioural tests
-#
-#    def test_standard_behaviour_determines_GET(self):
-#        """GET requests identified as GET method with StandardMethodMixin"""
-#        request = self.req.get('/')
-#        self.assertEqual(StandardMethodMixin().determine_method(request), 'GET')
-#
-#    def test_standard_behaviour_determines_POST(self):
-#        """POST requests identified as POST method with StandardMethodMixin"""
-#        request = self.req.post('/')
-#        self.assertEqual(StandardMethodMixin().determine_method(request), 'POST')
-#    
-#    def test_overloaded_POST_behaviour_determines_GET(self):
-#        """GET requests identified as GET method with OverloadedPOSTMethodMixin"""
-#        request = self.req.get('/')
-#        self.assertEqual(OverloadedPOSTMethodMixin().determine_method(request), 'GET')
-#
-#    def test_overloaded_POST_behaviour_determines_POST(self):
-#        """POST requests identified as POST method with OverloadedPOSTMethodMixin"""
-#        request = self.req.post('/')
-#        self.assertEqual(OverloadedPOSTMethodMixin().determine_method(request), 'POST')
-#    
-#    def test_overloaded_POST_behaviour_determines_overloaded_method(self):
-#        """POST requests can be overloaded to another method by setting a reserved form field with OverloadedPOSTMethodMixin"""
-#        request = self.req.post('/', {OverloadedPOSTMethodMixin.METHOD_PARAM: 'DELETE'})
-#        self.assertEqual(OverloadedPOSTMethodMixin().determine_method(request), 'DELETE')
+from django.test import TestCase
+from djangorestframework.compat import RequestFactory
+from djangorestframework.mixins import RequestMixin
+
+
+class TestMethodOverloading(TestCase): 
+    def setUp(self):
+        self.req = RequestFactory()
+
+    def test_standard_behaviour_determines_GET(self):
+        """GET requests identified"""
+        view = RequestMixin()
+        view.request = self.req.get('/')
+        self.assertEqual(view.method, 'GET')
+
+    def test_standard_behaviour_determines_POST(self):
+        """POST requests identified"""
+        view = RequestMixin()
+        view.request = self.req.post('/')
+        self.assertEqual(view.method, 'POST')
+    
+    def test_overloaded_POST_behaviour_determines_overloaded_method(self):
+        """POST requests can be overloaded to another method by setting a reserved form field"""
+        view = RequestMixin()
+        view.request = self.req.post('/', {view._METHOD_PARAM: 'DELETE'})
+        self.assertEqual(view.method, 'DELETE')