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

change wording of platform admin toggle to positive rather than negative

Browse Source 
CHS Approved Wording 👍

also rename suppress_platform_admin -> disable_platform_admin_view in
the backend, as suppress is a kinda weird word.
This commit is contained in:
Leo Hemsted
2019-06-14 12:32:47 +01:00
parent 7b02cb72c6
commit c724f84c23
6 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
tests/app/main/views/test_user_profile.py
View File

@@ -14,18 +14,18 @@ def test_should_show_overview_page(
):
page = client_request.get(('main.user_profile'))
assert page.select_one('h1').text.strip() == 'Your profile'
assert 'Suppress Platform Admin' not in page
assert 'Use platform admin view' not in page
def test_overview_page_shows_suppress_for_platform_admin(
def test_overview_page_shows_disable_for_platform_admin(
client_request,
platform_admin_user
):
client_request.login(platform_admin_user)
page = client_request.get(('main.user_profile'))
assert page.select_one('h1').text.strip() == 'Your profile'
suppress_platform_admin_row = page.select('tr')[-1]
assert ' '.join(suppress_platform_admin_row.text.split()) == 'Suppress Platform Admin Off Change'
disable_platform_admin_row = page.select('tr')[-1]
assert ' '.join(disable_platform_admin_row.text.split()) == 'Use platform admin view Yes Change'
def test_should_show_name_page(
@@ -278,47 +278,47 @@ def test_non_gov_user_cannot_access_change_email_page(
client_request.get('main.user_profile_email', _expected_status=403)
def test_normal_user_doesnt_see_suppress_platform_admin(client_request):
client_request.get('main.user_profile_suppress_platform_admin', _expected_status=403)
def test_normal_user_doesnt_see_disable_platform_admin(client_request):
client_request.get('main.user_profile_disable_platform_admin_view', _expected_status=403)
def test_platform_admin_can_see_suppress_platform_admin_page(client_request, platform_admin_user):
def test_platform_admin_can_see_disable_platform_admin_page(client_request, platform_admin_user):
client_request.login(platform_admin_user)
page = client_request.get('main.user_profile_suppress_platform_admin')
page = client_request.get('main.user_profile_disable_platform_admin_view')
assert page.select_one('h1').text.strip() == 'Suppress platform admin'
assert page.select_one('input[checked]')['value'] == 'False'
assert page.select_one('h1').text.strip() == 'Use platform admin view'
assert page.select_one('input[checked]')['value'] == 'True'
def test_can_suppress_platform_admin(client_request, platform_admin_user):
def test_can_disable_platform_admin(client_request, platform_admin_user):
client_request.login(platform_admin_user)
with client_request.session_transaction() as session:
assert 'suppress_platform_admin' not in session
assert 'disable_platform_admin_view' not in session
client_request.post(
'main.user_profile_suppress_platform_admin',
_data={'enabled': True},
_expected_status=302,
_expected_redirect=url_for('main.user_profile', _external=True),
)
with client_request.session_transaction() as session:
assert session['suppress_platform_admin'] is True
def test_can_turn_off_suppress_platform_admin(client_request, platform_admin_user):
client_request.login(platform_admin_user)
with client_request.session_transaction() as session:
session['suppress_platform_admin'] = True
client_request.post(
'main.user_profile_suppress_platform_admin',
'main.user_profile_disable_platform_admin_view',
_data={'enabled': False},
_expected_status=302,
_expected_redirect=url_for('main.user_profile', _external=True),
)
with client_request.session_transaction() as session:
assert session['suppress_platform_admin'] is False
assert session['disable_platform_admin_view'] is True
def test_can_reenable_platform_admin(client_request, platform_admin_user):
client_request.login(platform_admin_user)
with client_request.session_transaction() as session:
session['disable_platform_admin_view'] = True
client_request.post(
'main.user_profile_disable_platform_admin_view',
_data={'enabled': True},
_expected_status=302,
_expected_redirect=url_for('main.user_profile', _external=True),
)
with client_request.session_transaction() as session:
assert session['disable_platform_admin_view'] is False

4
tests/app/models/test_user.py
View File

@@ -51,10 +51,10 @@ def test_activate_user_already_active(app_, api_user_active, mock_activate_user)
(False, False, False),
(False, None, False),
])
def test_platform_admin_checks_flag_set_in_session(client, mocker, is_platform_admin, value_in_session, expected_result):
def test_platform_admin_flag_set_in_session(client, mocker, is_platform_admin, value_in_session, expected_result):
session_dict = {}
if value_in_session is not None:
session_dict['suppress_platform_admin'] = value_in_session
session_dict['disable_platform_admin_view'] = value_in_session
mocker.patch.dict('app.models.user.session', values=session_dict, clear=True)