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

Merge branch 'master' into testing-doc

Browse Source
This commit is contained in:
Rebecca Law
2017-01-31 16:36:03 +00:00
parent dc9524f01e 7cf436a9c8
commit 7f31bd7548
13 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/app/main/test_validators.py
View File

@@ -82,7 +82,6 @@ def _gen_mock_field(x):
'test@ucds.email',
'test@naturalengland.org.uk',
'test@hmcts.net',
'test@irmsecurity.com' # remove once pen test complete
])
def test_valid_list_of_white_list_email_domains(app_, email):
with app_.test_request_context():

17
tests/app/main/views/test_send.py
View File

@@ -409,31 +409,24 @@ def test_create_job_should_call_api(
)
def test_cant_start_letters_job(
app_,
client,
service_one,
mock_get_service,
active_user_with_permissions,
def test_can_start_letters_job(
logged_in_client,
mock_create_job,
mock_get_service_letter_template,
mocker,
fake_uuid
):
client.login(active_user_with_permissions, mocker, service_one)
with client.session_transaction() as session:
with logged_in_client.session_transaction() as session:
session['upload_data'] = {
'original_file_name': 'example.csv',
'template_id': fake_uuid,
'notification_count': 123,
'valid': True
}
response = client.post(
response = logged_in_client.post(
url_for('main.start_job', service_id=fake_uuid, upload_id=fake_uuid),
data={}
)
assert response.status_code == 403
mock_create_job.assert_not_called()
assert response.status_code == 302
@pytest.mark.parametrize(

18
tests/app/main/views/test_service_settings.py
View File

@@ -396,7 +396,7 @@ def test_log_error_on_request_to_go_live(
'main.service_name_change',
'main.service_name_change_confirm',
'main.service_request_to_go_live',
'main.deactivate_service'
'main.archive_service'
])
def test_route_permissions(mocker, app_, api_user_active, service_one, route):
with app_.test_request_context():
@@ -419,7 +419,7 @@ def test_route_permissions(mocker, app_, api_user_active, service_one, route):
'main.service_switch_live',
'main.service_switch_research_mode',
'main.service_switch_can_send_letters',
'main.deactivate_service',
'main.archive_service',
])
def test_route_invalid_permissions(mocker, app_, api_user_active, service_one, route):
with app_.test_request_context():
@@ -458,7 +458,7 @@ def test_route_for_platform_admin(mocker, app_, platform_admin_user, service_one
'main.service_switch_can_send_letters',
])
def test_route_for_platform_admin_update_service(mocker, app_, platform_admin_user, service_one, route):
mocker.patch('app.service_api_client.deactivate_service')
mocker.patch('app.service_api_client.archive_service')
with app_.test_request_context():
validate_route_permission(mocker,
app_,
@@ -750,22 +750,22 @@ def test_switch_service_disable_letters(client, platform_admin_user, mocker):
assert mocked_fn.call_args == call(service['id'], {"can_send_letters": False})
def test_deactivate_service_after_confirm(client, platform_admin_user, service_one, mocker):
def test_archive_service_after_confirm(client, platform_admin_user, service_one, mocker):
mocked_fn = mocker.patch('app.service_api_client.post', return_value=service_one)
client.login(platform_admin_user, mocker, service_one)
response = client.post(url_for('main.deactivate_service', service_id=service_one['id']))
response = client.post(url_for('main.archive_service', service_id=service_one['id']))
assert response.status_code == 302
assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
assert mocked_fn.call_args == call('/service/{}/deactivate'.format(service_one['id']), data=None)
assert mocked_fn.call_args == call('/service/{}/archive'.format(service_one['id']), data=None)
def test_deactivate_service_prompts_user(client, platform_admin_user, service_one, mocker):
def test_archive_service_prompts_user(client, platform_admin_user, service_one, mocker):
mocked_fn = mocker.patch('app.service_api_client.post')
client.login(platform_admin_user, mocker, service_one)
response = client.get(url_for('main.deactivate_service', service_id=service_one['id']))
response = client.get(url_for('main.archive_service', service_id=service_one['id']))
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
@@ -773,7 +773,7 @@ def test_deactivate_service_prompts_user(client, platform_admin_user, service_on
assert mocked_fn.called is False
def test_cant_deactivate_inactive_service(client, platform_admin_user, service_one, mocker):
def test_cant_archive_inactive_service(client, platform_admin_user, service_one, mocker):
service_one['active'] = False
client.login(platform_admin_user, mocker, service_one)