Merge pull request #604 from ryanpetrello/survey_spec_validation_refactor

refactor survey spec validation into a separate testable function

awx/api/views.py

@@ -2884,7 +2884,14 @@ class JobTemplateSurveySpec(GenericAPIView):
 
         if not request.user.can_access(self.model, 'change', obj, None):
             raise PermissionDenied()
-        new_spec = request.data
+        response = self._validate_spec_data(request.data, obj.survey_spec)
+        if response:
+            return response
+        obj.survey_spec = request.data
+        obj.save(update_fields=['survey_spec'])
+        return Response()
+
+    def _validate_spec_data(self, new_spec, old_spec):
         if "name" not in new_spec:
             return Response(dict(error=_("'name' missing from survey spec.")), status=status.HTTP_400_BAD_REQUEST)
         if "description" not in new_spec:
@@ -2897,7 +2904,6 @@ class JobTemplateSurveySpec(GenericAPIView):
             return Response(dict(error=_("'spec' doesn't contain any items.")), status=status.HTTP_400_BAD_REQUEST)
 
         variable_set = set()
-        old_spec = obj.survey_spec
         old_spec_dict = JobTemplate.pivot_spec(old_spec)
         for idx, survey_item in enumerate(new_spec["spec"]):
             if not isinstance(survey_item, dict):
@@ -2946,10 +2952,6 @@ class JobTemplateSurveySpec(GenericAPIView):
                 # Submission provides new encrypted default
                 survey_item['default'] = encrypt_value(survey_item['default'])
 
-        obj.survey_spec = new_spec
-        obj.save(update_fields=['survey_spec'])
-        return Response()
-
     def delete(self, request, *args, **kwargs):
         obj = self.get_object()
         if not request.user.can_access(self.model, 'delete', obj):

awx/main/tests/unit/api/test_views.py

@@ -16,14 +16,10 @@ from awx.api.views import (
 
 from awx.main.models import (
     Host,
-    JobTemplate,
-    User
 )
 
 from awx.main.managers import HostManager
 
-from rest_framework.test import APIRequestFactory
-
 
 @pytest.fixture
 def mock_response_new(mocker):
@@ -225,40 +221,9 @@ class TestInventoryHostsList(object):
 
 class TestSurveySpecValidation:
 
-    @pytest.fixture
+    def test_create_text_encrypted(self):
-    def spec_view(self):
+        view = JobTemplateSurveySpec()
-        def view_factory(old_spec):
+        resp = view._validate_spec_data({
-            obj = JobTemplate()
-            if old_spec:
-                obj.survey_spec = old_spec
-
-            def save(**kwargs):
-                pass
-
-            def get_object():
-                return get_object.object
-
-            get_object.object = obj
-            obj.save = save
-
-            user = User(username='admin')
-
-            def can_access(*args, **kwargs):
-                return True
-
-            user.can_access = can_access
-
-            request = APIRequestFactory().get('/api/v2/job_templates/42/survey_spec/')
-            request.user = user
-            view = JobTemplateSurveySpec()
-            view.request = request
-            view.get_object = get_object
-            return view
-        return view_factory
-
-    def test_create_text_encrypted(self, spec_view):
-        view = spec_view(None)
-        view.request.data = {
             "name": "new survey",
             "description": "foobar",
             "spec": [
@@ -274,13 +239,12 @@ class TestSurveySpecValidation:
                     "type": "text"
                 }
             ]
-        }
+        }, {})
-        resp = view.post(view.request)
         assert resp.status_code == 400
         assert '$encrypted$ is a reserved keyword for password question defaults' in str(resp.data['error'])
 
-
+    def test_change_encrypted_var_name(self):
-    def test_change_encrypted_var_name(self, spec_view):
+        view = JobTemplateSurveySpec()
         old = {
             "name": "old survey",
             "description": "foobar",
@@ -298,18 +262,17 @@ class TestSurveySpecValidation:
                 }
             ]
         }
-        view = spec_view(old)
         new = deepcopy(old)
         new['spec'][0]['variable'] = 'openstack_username'
-        view.request.data = new
+        resp = view._validate_spec_data(new, old)
-        resp = view.post(view.request)
         assert resp.status_code == 400
         assert 'may not be used for new default' in str(resp.data['error'])
 
-    def test_use_saved_encrypted_default(self, spec_view):
+    def test_use_saved_encrypted_default(self):
         '''
         Save is allowed, the $encrypted$ replacement is done
         '''
+        view = JobTemplateSurveySpec()
         old = {
             "name": "old survey",
             "description": "foobar",
@@ -327,15 +290,12 @@ class TestSurveySpecValidation:
                 }
             ]
         }
-        view = spec_view(old)
         new = deepcopy(old)
         new['spec'][0]['default'] = '$encrypted$'
         new['spec'][0]['required'] = False
-        view.request.data = new
+        resp = view._validate_spec_data(new, old)
-        resp = view.post(view.request)
+        assert resp is None
-        assert resp.status_code == 200
+        assert new == {
-        assert resp.data is None
-        assert view.get_object.object.survey_spec == {
             "name": "old survey",
             "description": "foobar",
             "spec": [