darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-05 14:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

notify-api-332 rename organisation

Browse Source
This commit is contained in:
Kenneth Kehl
2023-07-10 11:06:29 -07:00
parent 8be3864d7a
commit 4940d5e93b
42 changed files with 1301 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/app/status/test_status.py
View File

@@ -1,7 +1,7 @@
import pytest
from flask import json
from tests.app.db import create_organisation, create_service
from tests.app.db import create_organization, create_service
@pytest.mark.parametrize('path', ['/', '/_status'])
@@ -15,42 +15,42 @@ def test_get_status_all_ok(client, notify_db_session, path):
assert resp_json['build_time']
def test_empty_live_service_and_organisation_counts(admin_request):
assert admin_request.get('status.live_service_and_organisation_counts') == {
'organisations': 0,
def test_empty_live_service_and_organization_counts(admin_request):
assert admin_request.get('status.live_service_and_organization_counts') == {
'organizations': 0,
'services': 0,
}
def test_populated_live_service_and_organisation_counts(admin_request):
def test_populated_live_service_and_organization_counts(admin_request):
# Org 1 has three real live services and one fake, for a total of 3
org_1 = create_organisation('org 1')
org_1 = create_organization('org 1')
live_service_1 = create_service(service_name='1')
live_service_1.organisation = org_1
live_service_1.organization = org_1
live_service_2 = create_service(service_name='2')
live_service_2.organisation = org_1
live_service_2.organization = org_1
live_service_3 = create_service(service_name='3')
live_service_3.organisation = org_1
live_service_3.organization = org_1
fake_live_service_1 = create_service(service_name='f1', count_as_live=False)
fake_live_service_1.organisation = org_1
fake_live_service_1.organization = org_1
inactive_service_1 = create_service(service_name='i1', active=False)
inactive_service_1.organisation = org_1
inactive_service_1.organization = org_1
# This service isn’t associated to an org, but should still be counted as live
create_service(service_name='4')
# Org 2 has no real live services
org_2 = create_organisation('org 2')
org_2 = create_organization('org 2')
trial_service_1 = create_service(service_name='t1', restricted=True)
trial_service_1.organisation = org_2
trial_service_1.organization = org_2
fake_live_service_2 = create_service(service_name='f2', count_as_live=False)
fake_live_service_2.organisation = org_2
fake_live_service_2.organization = org_2
inactive_service_2 = create_service(service_name='i2', active=False)
inactive_service_2.organisation = org_2
inactive_service_2.organization = org_2
# Org 2 has no services at all
create_organisation('org 3')
create_organization('org 3')
# This service isn’t associated to an org, and should not be counted as live
# because it’s marked as not counted
@@ -61,7 +61,7 @@ def test_populated_live_service_and_organisation_counts(admin_request):
create_service(service_name='t', restricted=True)
create_service(service_name='i', restricted=False, active=False)
assert admin_request.get('status.live_service_and_organisation_counts') == {
'organisations': 1,
assert admin_request.get('status.live_service_and_organization_counts') == {
'organizations': 1,
'services': 4,
}