From 8b39b3b41ad6a3552801663c78d40209bf0ac258 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Sun, 29 Oct 2017 16:27:16 -0400 Subject: [PATCH] fix admin edit of WFJT survey spec --- awx/api/views.py | 1 - awx/main/tests/functional/api/test_survey_spec.py | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 06290753e6..d9a1ddfd50 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2880,7 +2880,6 @@ class JobTemplateSurveySpec(GenericAPIView): class WorkflowJobTemplateSurveySpec(WorkflowsEnforcementMixin, JobTemplateSurveySpec): model = WorkflowJobTemplate - parent_model = WorkflowJobTemplate new_in_310 = True diff --git a/awx/main/tests/functional/api/test_survey_spec.py b/awx/main/tests/functional/api/test_survey_spec.py index a01e5c890a..77b00fede6 100644 --- a/awx/main/tests/functional/api/test_survey_spec.py +++ b/awx/main/tests/functional/api/test_survey_spec.py @@ -8,6 +8,7 @@ from awx.main.models.jobs import JobTemplate, Job from awx.main.models.activity_stream import ActivityStream from awx.conf.license import LicenseForbids from awx.main.access import JobTemplateAccess +from awx.main.utils.common import get_type_for_model def mock_no_surveys(self, add_host=False, feature=None, check_expiration=True): @@ -42,12 +43,15 @@ def test_survey_spec_view_denied(job_template_with_survey, get, admin_user): ('execute_role', 403), ('read_role', 403) ]) -def test_survey_edit_access(job_template, survey_spec_factory, rando, post, role_field, expected_status_code): +def test_survey_edit_access(job_template, workflow_job_template, survey_spec_factory, rando, post, + role_field, expected_status_code): survey_input_data = survey_spec_factory('new_question') - role = getattr(job_template, role_field) - role.members.add(rando) - post(reverse('api:job_template_survey_spec', kwargs={'pk': job_template.id}), - user=rando, data=survey_input_data, expect=expected_status_code) + for template in (job_template, workflow_job_template): + role = getattr(template, role_field) + role.members.add(rando) + post(reverse('api:{}_survey_spec'.format(get_type_for_model(template.__class__)), + kwargs={'pk': template.id}), + user=rando, data=survey_input_data, expect=expected_status_code) @mock.patch('awx.main.access.BaseAccess.check_license', mock_no_surveys)