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

Refactor code after rebase

Browse Source
This commit is contained in:
Ken Tsang
2017-08-02 11:20:33 +01:00
parent b1d1c6881f
commit 82f0ef58bf
5 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/app/main/views/test_organisations.py
View File

@@ -113,18 +113,18 @@ def test_manage_orgs_shows_correct_org_info(request_get_manage_org_with_org):
def test_manage_orgs_does_not_show_data_for_new_org(request_get_manage_org_without_org):
assert request_get_manage_org_without_org.select_one('div.page-footer > input.button').has_attr('disabled')
assert request_get_manage_org_without_org.select_one('div.page-footer input.button').has_attr('disabled')
assert request_get_manage_org_without_org.select_one('#logo-img > img') is None
assert request_get_manage_org_without_org.select_one('#name').attrs.get('value') == ''
assert request_get_manage_org_without_org.select_one('#colour').attrs.get('value') == ''
def test_save_is_enabled_when_logo_is_set(request_get_manage_org_with_org):
assert request_get_manage_org_with_org.select_one('div.page-footer > input.button').has_attr('disabled') is False
assert request_get_manage_org_with_org.select_one('div.page-footer input.button').has_attr('disabled') is False
def test_save_is_disabled_when_logo_is_not_set(request_get_manage_org_without_org):
assert request_get_manage_org_without_org.select_one('div.page-footer > input.button').has_attr('disabled')
assert request_get_manage_org_without_org.select_one('div.page-footer input.button').has_attr('disabled')
@pytest.fixture
@@ -157,7 +157,7 @@ def test_shows_temp_logo_after_uploading_logo(request_post_manage_org_redirect):
def test_save_enabled_after_uploading_logo(request_post_manage_org_redirect):
page, _ = request_post_manage_org_redirect
assert not page.select_one('div.page-footer > input.button').has_attr('disabled')
assert not page.select_one('div.page-footer input.button').has_attr('disabled')
def test_deletes_previous_temp_logo_after_uploading_logo(logged_in_platform_admin_client, mocker, fake_uuid):

2
tests/app/test_utils.py
View File

@@ -156,8 +156,6 @@ def test_generate_notifications_csv_calls_twice_if_next_link(mocker):
assert mock_get_notifications.mock_calls[1][2]['page'] == 2
<<<<<<< HEAD
<<<<<<< HEAD
@freeze_time('2017-07-14 14:59:59') # Friday, before print deadline
@pytest.mark.parametrize('upload_time, expected_print_time, is_printed, expected_earliest, expected_latest', [