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

Keep Last changed text.

Browse Source 
Update user test data to include the password_changed_at attribute.
This commit is contained in:
Rebecca Law
2016-06-28 10:40:39 +01:00
parent 7d64b77e5d
commit de42391afa
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/user-profile.html
View File

@@ -14,7 +14,7 @@
{'label': 'Name', 'value': current_user.name, 'url': url_for('.user_profile_name')}, {'label': 'Name', 'value': current_user.name, 'url': url_for('.user_profile_name')},
{'label': 'Email address', 'value': current_user.email_address, 'url': url_for('.user_profile_email')}, {'label': 'Email address', 'value': current_user.email_address, 'url': url_for('.user_profile_email')},
{'label': 'Mobile number', 'value': current_user.mobile_number, 'url': url_for('.user_profile_mobile_number')}, {'label': 'Mobile number', 'value': current_user.mobile_number, 'url': url_for('.user_profile_mobile_number')},
{'label': 'Password', 'value': current_user.password_changed_at |format_datetime_short, 'url': url_for('.user_profile_password')}, {'label': 'Password', 'value': 'Last changed ' + current_user.password_changed_at |format_datetime_short, 'url': url_for('.user_profile_password')},
], ],
caption='Account settings', caption='Account settings',
field_headings=['Setting', 'Value', 'Link to change'], field_headings=['Setting', 'Value', 'Link to change'],

16
tests/conftest.py
View File

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