darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-26 17:24:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "use new activate endpoint"

Browse Source
This commit is contained in:
Leo Hemsted
2017-11-09 14:55:08 +00:00
committed by GitHub
parent 51e91bc627
commit b9eca67b0d
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/notify_client/user_api_client.py
View File

@@ -148,8 +148,9 @@ class UserApiClient(NotifyAdminAPIClient):
def activate_user(self, user): def activate_user(self, user):
if user.state == 'pending': if user.state == 'pending':
url = "/user/{}/activate".format(user.id) user.state = 'active'
user_data = self.post(url) url = "/user/{}".format(user.id)
user_data = self.post(url, data={'state': 'active'})
return User(user_data['data'], max_failed_login_count=self.max_failed_login_count) return User(user_data['data'], max_failed_login_count=self.max_failed_login_count)
else: else:
return user return user

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

@@ -33,22 +33,3 @@ def test_client_updates_password_separately(mocker, api_user_active):
client.update_password(api_user_active.id, expected_params['_password']) client.update_password(api_user_active.id, expected_params['_password'])
mock_update_password.assert_called_once_with(expected_url, data=expected_params) mock_update_password.assert_called_once_with(expected_url, data=expected_params)
def test_client_activates_if_pending(mocker, api_user_pending):
mock_post = mocker.patch('app.notify_client.user_api_client.UserApiClient.post')
client = UserApiClient()
client.max_failed_login_count = 1 # doesn't matter for this test
client.activate_user(api_user_pending)
mock_post.assert_called_once_with('/user/{}/activate'.format(api_user_pending.id))
def test_client_doesnt_activate_if_already_active(mocker, api_user_active):
mock_post = mocker.patch('app.notify_client.user_api_client.UserApiClient.post')
client = UserApiClient()
client.activate_user(api_user_active)
assert not mock_post.called