darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 22:40:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2911 from alphagov/stop-posting-service-domain

Browse Source 
Stop sending service domain to the API
This commit is contained in:
Chris Hill-Scott
2019-04-12 17:26:43 +01:00
committed by GitHub
parent 5ac6255be7 700e073d0f
commit e8b95f03c6
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notify_client/service_api_client.py
View File

@@ -13,7 +13,6 @@ class ServiceAPIClient(NotifyAdminAPIClient):
restricted, restricted,
user_id, user_id,
email_from, email_from,
service_domain,
): ):
""" """
Create a service and return the json. Create a service and return the json.
@@ -26,7 +25,6 @@ class ServiceAPIClient(NotifyAdminAPIClient):
"user_id": user_id, "user_id": user_id,
"restricted": restricted, "restricted": restricted,
"email_from": email_from, "email_from": email_from,
"service_domain": service_domain
} }
data = _attach_current_user(data) data = _attach_current_user(data)
return self.post("/service", data)['data']['id'] return self.post("/service", data)['data']['id']

2
tests/app/notify_client/test_service_api_client.py
View File

@@ -74,7 +74,6 @@ def test_client_creates_service_with_correct_data(
True, True,
fake_uuid, fake_uuid,
'test@example.com', 'test@example.com',
'nhs.uk'
) )
mock_post.assert_called_once_with( mock_post.assert_called_once_with(
'/service', '/service',
@@ -90,7 +89,6 @@ def test_client_creates_service_with_correct_data(
restricted=True, restricted=True,
user_id=fake_uuid, user_id=fake_uuid,
email_from='test@example.com', email_from='test@example.com',
service_domain='nhs.uk'
), ),
) )

2
tests/app/notify_client/test_user_client.py
View File

@@ -253,7 +253,7 @@ def test_returns_value_from_cache(
(user_api_client, 'set_user_permissions', [user_id, SERVICE_ONE_ID, []], {}), (user_api_client, 'set_user_permissions', [user_id, SERVICE_ONE_ID, []], {}),
(user_api_client, 'activate_user', [api_user_pending(sample_uuid())], {}), (user_api_client, 'activate_user', [api_user_pending(sample_uuid())], {}),
(service_api_client, 'remove_user_from_service', [SERVICE_ONE_ID, user_id], {}), (service_api_client, 'remove_user_from_service', [SERVICE_ONE_ID, user_id], {}),
(service_api_client, 'create_service', ['', '', 0, False, user_id, sample_uuid(), ''], {}), (service_api_client, 'create_service', ['', '', 0, False, user_id, sample_uuid()], {}),
(invite_api_client, 'accept_invite', [SERVICE_ONE_ID, user_id], {}), (invite_api_client, 'accept_invite', [SERVICE_ONE_ID, user_id], {}),
]) ])
def test_deletes_user_cache( def test_deletes_user_cache(