Eliminated redundant http request code in test suite

awx/main/tests/functional/conftest.py

@@ -293,17 +293,23 @@ def permissions():
                  'update':False, 'delete':False, 'scm_update':False, 'execute':False, 'use':True,},
     }
 
-@pytest.fixture
+
-def post():
+def _request(verb):
-    def rf(url, data, user=None, middleware=None, expect=None, **kwargs):
+    def rf(url, data_or_user=None, user=None, middleware=None, expect=None, **kwargs):
-        view, view_args, view_kwargs = resolve(urlparse(url)[2])
+        if type(data_or_user) is User and user is None:
+            user = data_or_user
+        elif 'data' not in kwargs:
+            kwargs['data'] = data_or_user
         if 'format' not in kwargs:
             kwargs['format'] = 'json'
-        request = APIRequestFactory().post(url, data, **kwargs)
+
+        view, view_args, view_kwargs = resolve(urlparse(url)[2])
+        request = getattr(APIRequestFactory(), verb)(url, **kwargs)
         if middleware:
             middleware.process_request(request)
         if user:
             force_authenticate(request, user=user)
+
         response = view(request, *view_args, **view_kwargs)
         if middleware:
             middleware.process_response(request, response)
@@ -311,134 +317,37 @@ def post():
             if response.status_code != expect:
                 print(response.data)
             assert response.status_code == expect
+        response.render()
         return response
     return rf
 
+@pytest.fixture
+def post():
+    return _request('post')
+
 @pytest.fixture
 def get():
-    def rf(url, user=None, middleware=None, expect=None, **kwargs):
+    return _request('get')
-        view, view_args, view_kwargs = resolve(urlparse(url)[2])
-        if 'format' not in kwargs:
-            kwargs['format'] = 'json'
-        request = APIRequestFactory().get(url, **kwargs)
-        if middleware:
-            middleware.process_request(request)
-        if user:
-            force_authenticate(request, user=user)
-        response = view(request, *view_args, **view_kwargs)
-        if middleware:
-            middleware.process_response(request, response)
-        if expect:
-            if response.status_code != expect:
-                print(response.data)
-            assert response.status_code == expect
-        return response
-    return rf
 
 @pytest.fixture
 def put():
-    def rf(url, data, user=None, middleware=None, expect=None, **kwargs):
+    return _request('put')
-        view, view_args, view_kwargs = resolve(urlparse(url)[2])
-        if 'format' not in kwargs:
-            kwargs['format'] = 'json'
-        request = APIRequestFactory().put(url, data, **kwargs)
-        if middleware:
-            middleware.process_request(request)
-        if user:
-            force_authenticate(request, user=user)
-        response = view(request, *view_args, **view_kwargs)
-        if middleware:
-            middleware.process_response(request, response)
-        if expect:
-            if response.status_code != expect:
-                print(response.data)
-            assert response.status_code == expect
-        return response
-    return rf
 
 @pytest.fixture
 def patch():
-    def rf(url, data, user=None, middleware=None, expect=None, **kwargs):
+    return _request('patch')
-        view, view_args, view_kwargs = resolve(urlparse(url)[2])
-        if 'format' not in kwargs:
-            kwargs['format'] = 'json'
-        request = APIRequestFactory().patch(url, data, **kwargs)
-        if middleware:
-            middleware.process_request(request)
-        if user:
-            force_authenticate(request, user=user)
-        response = view(request, *view_args, **view_kwargs)
-        if middleware:
-            middleware.process_response(request, response)
-        if expect:
-            if response.status_code != expect:
-                print(response.data)
-            assert response.status_code == expect
-        return response
-    return rf
 
 @pytest.fixture
 def delete():
-    def rf(url, user=None, middleware=None, expect=None, **kwargs):
+    return _request('delete')
-        view, view_args, view_kwargs = resolve(urlparse(url)[2])
-        if 'format' not in kwargs:
-            kwargs['format'] = 'json'
-        request = APIRequestFactory().delete(url, **kwargs)
-        if middleware:
-            middleware.process_request(request)
-        if user:
-            force_authenticate(request, user=user)
-        response = view(request, *view_args, **view_kwargs)
-        if middleware:
-            middleware.process_response(request, response)
-        if expect:
-            if response.status_code != expect:
-                print(response.data)
-            assert response.status_code == expect
-        return response
-    return rf
 
 @pytest.fixture
 def head():
-    def rf(url, user=None, middleware=None, expect=None, **kwargs):
+    return _request('head')
-        view, view_args, view_kwargs = resolve(urlparse(url)[2])
-        if 'format' not in kwargs:
-            kwargs['format'] = 'json'
-        request = APIRequestFactory().head(url, **kwargs)
-        if middleware:
-            middleware.process_request(request)
-        if user:
-            force_authenticate(request, user=user)
-        response = view(request, *view_args, **view_kwargs)
-        if middleware:
-            middleware.process_response(request, response)
-        if expect:
-            if response.status_code != expect:
-                print(response.data)
-            assert response.status_code == expect
-        return response
-    return rf
 
 @pytest.fixture
 def options():
-    def rf(url, data, user=None, middleware=None, expect=None, **kwargs):
+    return _request('options')
-        view, view_args, view_kwargs = resolve(urlparse(url)[2])
-        if 'format' not in kwargs:
-            kwargs['format'] = 'json'
-        request = APIRequestFactory().options(url, data, **kwargs)
-        if middleware:
-            middleware.process_request(request)
-        if user:
-            force_authenticate(request, user=user)
-        response = view(request, *view_args, **view_kwargs)
-        if middleware:
-            middleware.process_response(request, response)
-        if expect:
-            if response.status_code != expect:
-                print(response.data)
-            assert response.status_code == expect
-        return response
-    return rf