Working tests, hopefully all code changes done.

This commit is contained in:
Nicholas Staples
2016-01-27 12:22:32 +00:00
parent ce81a6f540
commit 6959d695d3
57 changed files with 1143 additions and 1578 deletions

View File

@@ -1,11 +1,15 @@
from flask import (url_for, session)
def test_should_show_overview(app_, db_, db_session, mock_api_user, mock_get_service,
mock_user_loader, mock_user_dao_get_by_email):
def test_should_show_overview(app_,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.get(url_for(
'main.service_settings', service_id=service_id))
@@ -16,11 +20,15 @@ def test_should_show_overview(app_, db_, db_session, mock_api_user, mock_get_ser
assert mock_get_service.called
def test_should_show_service_name(app_, db_, db_session, mock_api_user, mock_get_service,
mock_user_loader, mock_user_dao_get_by_email):
def test_should_show_service_name(app_,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.get(url_for(
'main.service_name_change', service_id=service_id))
@@ -31,11 +39,15 @@ def test_should_show_service_name(app_, db_, db_session, mock_api_user, mock_get
service = mock_get_service.side_effect(service_id)['data']
def test_should_redirect_after_change_service_name(app_, db_, db_session, mock_api_user, mock_get_service,
mock_user_loader, mock_user_dao_get_by_email):
def test_should_redirect_after_change_service_name(app_,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.post(url_for(
'main.service_name_change', service_id=service_id))
@@ -48,15 +60,14 @@ def test_should_redirect_after_change_service_name(app_, db_, db_session, mock_a
def test_should_show_service_name_confirmation(app_,
db_,
db_session,
mock_api_user,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email):
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.get(url_for(
'main.service_name_change_confirm', service_id=service_id))
@@ -68,16 +79,16 @@ def test_should_show_service_name_confirmation(app_,
def test_should_redirect_after_service_name_confirmation(app_,
db_,
db_session,
mock_api_user,
api_user_active,
mock_get_service,
mock_update_service,
mock_user_loader,
mock_user_dao_get_by_email):
mock_user_dao_get_by_email,
mock_login,
mock_verify_password):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
service_new_name = 'New Name'
with client.session_transaction() as session:
@@ -94,11 +105,15 @@ def test_should_redirect_after_service_name_confirmation(app_,
assert mock_update_service.called
def test_should_show_request_to_go_live(app_, db_, db_session, mock_api_user, mock_get_service,
mock_user_loader, mock_user_dao_get_by_email):
def test_should_show_request_to_go_live(app_,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.get(
url_for('main.service_request_to_go_live', service_id=service_id))
@@ -110,16 +125,15 @@ def test_should_show_request_to_go_live(app_, db_, db_session, mock_api_user, mo
def test_should_redirect_after_request_to_go_live(app_,
db_,
db_session,
mock_api_user,
api_user_active,
mock_get_service,
mock_update_service,
mock_user_loader,
mock_user_dao_get_by_email):
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.post(url_for(
'main.service_request_to_go_live', service_id=service_id))
@@ -132,11 +146,15 @@ def test_should_redirect_after_request_to_go_live(app_,
assert mock_update_service.called
def test_should_show_status_page(app_, db_, db_session, mock_api_user, mock_get_service,
mock_user_loader, mock_user_dao_get_by_email):
def test_should_show_status_page(app_,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.get(url_for(
'main.service_status_change', service_id=service_id))
@@ -148,15 +166,14 @@ def test_should_show_status_page(app_, db_, db_session, mock_api_user, mock_get_
def test_should_show_redirect_after_status_change(app_,
db_,
db_session,
mock_api_user,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email):
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.post(url_for(
'main.service_status_change', service_id=service_id))
@@ -168,11 +185,15 @@ def test_should_show_redirect_after_status_change(app_,
assert mock_get_service.called
def test_should_show_status_confirmation(app_, db_, db_session, mock_api_user, mock_get_service,
mock_user_loader, mock_user_dao_get_by_email):
def test_should_show_status_confirmation(app_,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.get(url_for(
'main.service_status_change_confirm', service_id=service_id))
@@ -184,16 +205,16 @@ def test_should_show_status_confirmation(app_, db_, db_session, mock_api_user, m
def test_should_redirect_after_status_confirmation(app_,
db_,
db_session,
mock_api_user,
api_user_active,
mock_get_service,
mock_update_service,
mock_user_loader,
mock_user_dao_get_by_email):
mock_user_dao_get_by_email,
mock_login,
mock_verify_password):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.post(url_for(
'main.service_status_change_confirm', service_id=service_id))
@@ -206,11 +227,15 @@ def test_should_redirect_after_status_confirmation(app_,
assert mock_update_service.called
def test_should_show_delete_page(app_, db_, db_session, mock_api_user, mock_get_service,
mock_user_loader, mock_user_dao_get_by_email):
def test_should_show_delete_page(app_,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.get(url_for(
'main.service_delete', service_id=service_id))
@@ -220,11 +245,15 @@ def test_should_show_delete_page(app_, db_, db_session, mock_api_user, mock_get_
assert mock_get_service.called
def test_should_show_redirect_after_deleting_service(app_, db_, db_session, mock_api_user, mock_get_service,
mock_user_loader, mock_user_dao_get_by_email):
def test_should_show_redirect_after_deleting_service(app_,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.post(url_for(
'main.service_delete', service_id=service_id))
@@ -235,11 +264,15 @@ def test_should_show_redirect_after_deleting_service(app_, db_, db_session, mock
assert delete_url == response.location
def test_should_show_delete_confirmation(app_, db_, db_session, mock_api_user, mock_get_service,
mock_user_loader, mock_user_dao_get_by_email):
def test_should_show_delete_confirmation(app_,
api_user_active,
mock_get_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.get(url_for(
'main.service_delete_confirm', service_id=service_id))
@@ -250,16 +283,16 @@ def test_should_show_delete_confirmation(app_, db_, db_session, mock_api_user, m
def test_should_redirect_delete_confirmation(app_,
db_,
db_session,
mock_api_user,
api_user_active,
mock_get_service,
mock_delete_service,
mock_user_loader,
mock_user_dao_get_by_email):
mock_user_dao_get_by_email,
mock_login,
mock_verify_password):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(api_user_active)
service_id = 123
response = client.post(url_for(
'main.service_delete_confirm', service_id=service_id))