Merge pull request #3054 from thekorn/compat_requestfactory_secure

Compat requestfactory secure

rest_framework/compat.py

@@ -199,8 +199,6 @@ if 'patch' not in View.http_method_names:
     View.http_method_names = View.http_method_names + ['patch']
 
 
-# RequestFactory only provides `generic` from 1.5 onwards
-from django.test.client import RequestFactory as DjangoRequestFactory
 from django.test.client import FakePayload
 
 try:
@@ -211,7 +209,13 @@ except ImportError:
     from django.utils.encoding import smart_str as force_bytes_or_smart_bytes
 
 
-class RequestFactory(DjangoRequestFactory):
+# RequestFactory only provides `generic` from 1.5 onwards
+if django.VERSION >= (1, 5):
+    from django.test.client import RequestFactory
+else:
+    from django.test.client import RequestFactory as DjangoRequestFactory
+
+    class RequestFactory(DjangoRequestFactory):
         def generic(self, method, path,
                 data='', content_type='application/octet-stream', **extra):
             parsed = _urlparse(path)

tests/test_request.py

@@ -24,6 +24,8 @@ from rest_framework.test import APIRequestFactory, APIClient
 from rest_framework.views import APIView
 from io import BytesIO
 import json
+import django
+import pytest
 
 
 factory = APIRequestFactory()
@@ -275,3 +277,16 @@ class TestAuthSetter(TestCase):
         request = Request(factory.get('/'))
         request.auth = 'DUMMY'
         self.assertEqual(request.auth, 'DUMMY')
+
+
+@pytest.mark.skipif(django.VERSION < (1, 7),
+                    reason='secure argument is only available for django1.7+')
+class TestSecure(TestCase):
+
+    def test_default_secure_false(self):
+        request = Request(factory.get('/', secure=False))
+        self.assertEqual(request.scheme, 'http')
+
+    def test_default_secure_true(self):
+        request = Request(factory.get('/', secure=True))
+        self.assertEqual(request.scheme, 'https')