Merge branch 'main' into stvnrlly-remove-broadcasts

This commit is contained in:
stvnrlly
2022-10-20 19:44:20 -04:00
56 changed files with 1011 additions and 613 deletions

View File

@@ -687,7 +687,7 @@ def test_update_service(client, notify_db_session, sample_service):
'email_from': 'updated.service.name',
'created_by': str(sample_service.created_by.id),
'email_branding': str(brand.id),
'organisation_type': 'school_or_college',
'organisation_type': 'federal',
}
auth_header = create_admin_authorization_header()
@@ -702,7 +702,7 @@ def test_update_service(client, notify_db_session, sample_service):
assert result['data']['name'] == 'updated service name'
assert result['data']['email_from'] == 'updated.service.name'
assert result['data']['email_branding'] == str(brand.id)
assert result['data']['organisation_type'] == 'school_or_college'
assert result['data']['organisation_type'] == 'federal'
def test_cant_update_service_org_type_to_random_value(client, sample_service):