darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 13:39:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-password-changed-at

Browse Source 
Conflicts:
	tests/conftest.py
This commit is contained in:
Rebecca Law
2016-06-28 11:02:53 +01:00
parent de42391afa ff9fcfb419
commit 584ad26a1a
3 changed files with 49 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/conftest.py
View File

@@ -423,8 +423,7 @@ def api_user_pending(fake_uuid):
'mobile_number': '07700 900762',
'state': 'pending',
'failed_login_count': 0,
'permissions': {},
'password_changed_at': str(datetime.utcnow())
'permissions': {}
}
user = User(user_data)
return user
@@ -441,8 +440,7 @@ def platform_admin_user(fake_uuid):
'state': 'active',
'failed_login_count': 0,
'permissions': {},
'platform_admin': True,
'password_changed_at': str(datetime.utcnow())
'platform_admin': True
}
user = User(user_data)
return user
@@ -485,8 +483,7 @@ def active_user_with_permissions(fake_uuid):
'manage_settings',
'manage_api_keys',
'view_activity']},
'platform_admin': False,
'password_changed_at': str(datetime.utcnow())
'platform_admin': False
}
user = User(user_data)
return user
@@ -502,8 +499,7 @@ def api_user_locked(fake_uuid):
'mobile_number': '07700 900762',
'state': 'active',
'failed_login_count': 5,
'permissions': {},
'password_changed_at': str(datetime.utcnow())
'permissions': {}
}
user = User(user_data)
return user
@@ -520,7 +516,7 @@ def api_user_request_password_reset(fake_uuid):
'state': 'active',
'failed_login_count': 5,
'permissions': {},
'password_changed_at': str(datetime.utcnow())
'password_changed_at': None
}
user = User(user_data)
return user
@@ -550,7 +546,6 @@ def mock_register_user(mocker, api_user_pending):
api_user_pending.email_address = email_address
api_user_pending.mobile_number = mobile_number
api_user_pending.password = password
return api_user_pending
return mocker.patch('app.user_api_client.register_user', side_effect=_register)
@@ -706,7 +701,7 @@ def mock_get_all_users_from_api(mocker):
@pytest.fixture(scope='function')
def mock_create_api_key(mocker):
def _create(service_id, key_name):
return {'data': str(generate_uuid())}
return str(generate_uuid())
return mocker.patch('app.api_key_api_client.create_api_key', side_effect=_create)