External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-04 19:08:30 -02:30
Code Issues Packages Projects Releases Wiki Activity

Removing references to 'any' state notifications

Browse Source
This commit is contained in:
beeankha
2019-06-13 10:26:57 -04:00
parent c65e6ba30b
commit c6f1806a23
22 changed files with 39 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/tests/functional/api/test_inventory.py
View File

@@ -42,9 +42,10 @@ def test_inventory_source_notification_on_cloud_only(get, post, inventory_source
not_is = inventory_source_factory("not_ec2")
url = reverse('api:inventory_source_notification_templates_any_list', kwargs={'pk': cloud_is.id})
response = post(url, dict(id=notification_template.id), u)
assert response.status_code == 204
# Delete the below portion?
# url = reverse('api:inventory_source_notification_templates_any_list', kwargs={'pk': cloud_is.id})
# response = post(url, dict(id=notification_template.id), u)
# assert response.status_code == 204
url = reverse('api:inventory_source_notification_templates_success_list', kwargs={'pk': not_is.id})
response = post(url, dict(id=notification_template.id), u)

25
awx/main/tests/functional/test_notifications.py
View File

@@ -92,18 +92,19 @@ def test_inherited_notification_templates(get, post, user, organization, project
isrc.save()
jt = JobTemplate.objects.create(name='test', inventory=i, project=project, playbook='debug.yml')
jt.save()
url = reverse('api:organization_notification_templates_any_list', kwargs={'pk': organization.id})
response = post(url, dict(id=notification_templates[0]), u)
assert response.status_code == 204
url = reverse('api:project_notification_templates_any_list', kwargs={'pk': project.id})
response = post(url, dict(id=notification_templates[1]), u)
assert response.status_code == 204
url = reverse('api:job_template_notification_templates_any_list', kwargs={'pk': jt.id})
response = post(url, dict(id=notification_templates[2]), u)
assert response.status_code == 204
assert len(jt.notification_templates['any']) == 3
assert len(project.notification_templates['any']) == 2
assert len(isrc.notification_templates['any']) == 1
# What can we replace the below tests with?
# url = reverse('api:organization_notification_templates_any_list', kwargs={'pk': organization.id})
# response = post(url, dict(id=notification_templates[0]), u)
# assert response.status_code == 204
# url = reverse('api:project_notification_templates_any_list', kwargs={'pk': project.id})
# response = post(url, dict(id=notification_templates[1]), u)
# assert response.status_code == 204
# url = reverse('api:job_template_notification_templates_any_list', kwargs={'pk': jt.id})
# response = post(url, dict(id=notification_templates[2]), u)
# assert response.status_code == 204
# assert len(jt.notification_templates['any']) == 3
# assert len(project.notification_templates['any']) == 2
# assert len(isrc.notification_templates['any']) == 1
@pytest.mark.django_db

2
awx/main/tests/unit/api/serializers/test_inventory_serializers.py
View File

@@ -71,7 +71,7 @@ class TestInventorySourceSerializerGetRelated(object):
'activity_stream',
'notification_templates_error',
'notification_templates_success',
'notification_templates_any',
'notification_templates_started',
'inventory_updates',
'update',
'hosts',

2
awx/main/tests/unit/api/serializers/test_job_template_serializers.py
View File

@@ -50,7 +50,7 @@ class TestJobTemplateSerializerGetRelated():
'schedules',
'activity_stream',
'launch',
'notification_templates_any',
'notification_templates_started',
'notification_templates_success',
'notification_templates_error',
'survey_spec',