From d4b20b7340ce979afa5c5409f8cce826bcb47b09 Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Tue, 20 Aug 2019 14:01:19 -0400 Subject: [PATCH] Update tests to use the `expect` keyword argument for get() and post() --- awx/main/tests/functional/api/test_webhooks.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/awx/main/tests/functional/api/test_webhooks.py b/awx/main/tests/functional/api/test_webhooks.py index 7bcbf1b1e5..183ab13793 100644 --- a/awx/main/tests/functional/api/test_webhooks.py +++ b/awx/main/tests/functional/api/test_webhooks.py @@ -25,8 +25,7 @@ def test_get_webhook_key_jt(organization_factory, job_template_factory, get, use getattr(grant_obj, '{}_role'.format(user_role.split()[1])).members.add(user) url = reverse('api:webhook_key', kwargs={'model_kwarg': 'job_templates', 'pk': jt.pk}) - response = get(url, user=user) - assert response.status_code == expect + response = get(url, user=user, expect=expect) if expect < 400: assert response.data == {'webhook_key': ''} @@ -52,8 +51,7 @@ def test_get_webhook_key_wfjt(organization_factory, workflow_job_template_factor getattr(grant_obj, '{}_role'.format(user_role.split()[1])).members.add(user) url = reverse('api:webhook_key', kwargs={'model_kwarg': 'workflow_job_templates', 'pk': wfjt.pk}) - response = get(url, user=user) - assert response.status_code == expect + response = get(url, user=user, expect=expect) if expect < 400: assert response.data == {'webhook_key': ''} @@ -80,8 +78,7 @@ def test_post_webhook_key_jt(organization_factory, job_template_factory, post, u getattr(grant_obj, '{}_role'.format(user_role.split()[1])).members.add(user) url = reverse('api:webhook_key', kwargs={'model_kwarg': 'job_templates', 'pk': jt.pk}) - response = post(url, {}, user=user) - assert response.status_code == expect + response = post(url, {}, user=user, expect=expect) if expect < 400: assert bool(response.data.get('webhook_key')) @@ -107,7 +104,6 @@ def test_post_webhook_key_wfjt(organization_factory, workflow_job_template_facto getattr(grant_obj, '{}_role'.format(user_role.split()[1])).members.add(user) url = reverse('api:webhook_key', kwargs={'model_kwarg': 'workflow_job_templates', 'pk': wfjt.pk}) - response = post(url, {}, user=user) - assert response.status_code == expect + response = post(url, {}, user=user, expect=expect) if expect < 400: assert bool(response.data.get('webhook_key'))