External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Updates to notification unit tests after @wwitzel3's feedback

Browse Source
This commit is contained in:
Matthew Jones
2016-02-29 13:25:49 -05:00
parent 0ee12901fe
commit b892ee5f96
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ def test_encrypted_subfields(get, post, user, organization):
response = post(url, response = post(url,
dict(name="test-twilio", dict(name="test-twilio",
description="test twilio", description="test twilio",
organization=1, organization=organization.id,
notification_type="twilio", notification_type="twilio",
notification_configuration=dict(account_sid="dummy", notification_configuration=dict(account_sid="dummy",
account_token="shouldhide", account_token="shouldhide",
@@ -67,7 +67,6 @@ def test_encrypted_subfields(get, post, user, organization):
u) u)
assert response.status_code == 201 assert response.status_code == 201
notifier_actual = Notifier.objects.get(id=response.data['id']) notifier_actual = Notifier.objects.get(id=response.data['id'])
assert notifier_actual.notification_configuration['account_token'].startswith("$encrypted$")
url = reverse('api:notifier_detail', args=(response.data['id'],)) url = reverse('api:notifier_detail', args=(response.data['id'],))
response = get(url, u) response = get(url, u)
assert response.data['notification_configuration']['account_token'] == "$encrypted$" assert response.data['notification_configuration']['account_token'] == "$encrypted$"
@@ -90,35 +89,30 @@ def test_inherited_notifiers(get, post, user, organization, project):
u) u)
assert response.status_code == 201 assert response.status_code == 201
notifiers.append(response.data['id']) notifiers.append(response.data['id'])
o = Organization.objects.get(id=1) organization.projects.add(project)
p = Project.objects.get(id=1) i = Inventory.objects.create(name='test', organization=organization)
o.projects.add(p)
i = Inventory.objects.create(name='test', organization=o)
i.save() i.save()
g = Group.objects.create(name='test', inventory=i) g = Group.objects.create(name='test', inventory=i)
g.save() g.save()
jt = JobTemplate.objects.create(name='test', inventory=i, project=p, playbook='debug.yml') jt = JobTemplate.objects.create(name='test', inventory=i, project=project, playbook='debug.yml')
jt.save() jt.save()
url = reverse('api:organization_notifiers_any_list', args=(1,)) url = reverse('api:organization_notifiers_any_list', args=(organization.id,))
response = post(url, dict(id=notifiers[0]), u) response = post(url, dict(id=notifiers[0]), u)
assert response.status_code == 204 assert response.status_code == 204
url = reverse('api:project_notifiers_any_list', args=(1,)) url = reverse('api:project_notifiers_any_list', args=(project.id,))
response = post(url, dict(id=notifiers[1]), u) response = post(url, dict(id=notifiers[1]), u)
assert response.status_code == 204 assert response.status_code == 204
url = reverse('api:job_template_notifiers_any_list', args=(jt.id,)) url = reverse('api:job_template_notifiers_any_list', args=(jt.id,))
response = post(url, dict(id=notifiers[2]), u) response = post(url, dict(id=notifiers[2]), u)
assert response.status_code == 204 assert response.status_code == 204
assert len(jt.notifiers['any']) == 3 assert len(jt.notifiers['any']) == 3
assert len(p.notifiers['any']) == 2 assert len(project.notifiers['any']) == 2
assert len(g.inventory_source.notifiers['any']) == 1 assert len(g.inventory_source.notifiers['any']) == 1
@pytest.mark.django_db @pytest.mark.django_db
def test_notifier_merging(get, post, user, organization, project, notifier): def test_notifier_merging(get, post, user, organization, project, notifier):
u = user('admin-poster', True) u = user('admin-poster', True)
o = Organization.objects.get(id=1) organization.projects.add(project)
p = Project.objects.get(id=1) organization.notifiers_any.add(notifier)
n = Notifier.objects.get(id=1) project.notifiers_any.add(notifier)
o.projects.add(p) assert len(project.notifiers['any']) == 1
o.notifiers_any.add(n)
p.notifiers_any.add(n)
assert len(p.notifiers['any']) == 1