All tests passing and merged with master.

This commit is contained in:
Nicholas Staples
2016-01-27 16:30:33 +00:00
51 changed files with 763 additions and 892 deletions

View File

@@ -4,8 +4,8 @@ from flask import url_for
def test_should_show_api_keys_and_documentation_page(app_,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
@@ -17,8 +17,8 @@ def test_should_show_api_keys_and_documentation_page(app_,
def test_should_show_empty_api_keys_page(app_,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_get_no_api_keys,
mock_login):
with app_.test_request_context():
@@ -34,8 +34,8 @@ def test_should_show_empty_api_keys_page(app_,
def test_should_show_api_keys_page(app_,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_get_api_keys,
mock_login):
with app_.test_request_context():
@@ -52,8 +52,8 @@ def test_should_show_api_keys_page(app_,
def test_should_show_name_api_key_page(app_,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_get_api_keys,
mock_login):
with app_.test_request_context():
@@ -66,8 +66,8 @@ def test_should_show_name_api_key_page(app_,
def test_should_render_show_api_key(app_,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_create_api_key,
mock_get_api_keys,
mock_login):
@@ -84,8 +84,8 @@ def test_should_render_show_api_key(app_,
def test_should_show_confirm_revoke_api_key(app_,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_get_api_keys,
mock_login):
with app_.test_request_context():
@@ -100,8 +100,8 @@ def test_should_show_confirm_revoke_api_key(app_,
def test_should_redirect_after_revoking_api_key(app_,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_revoke_api_key,
mock_get_api_keys,
mock_login):