From fcedae5fe1f0a72c6a8e6b706589b439965bac6f Mon Sep 17 00:00:00 2001 From: Adam Shimali Date: Wed, 20 Jan 2016 15:40:06 +0000 Subject: [PATCH] Merge conflicts and test fixes --- tests/app/main/views/test_add_service.py | 12 ++++++++---- tests/app/main/views/test_api_keys.py | 3 ++- tests/app/main/views/test_code_not_received.py | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/app/main/views/test_add_service.py b/tests/app/main/views/test_add_service.py index eba8fd3f6..df843adc4 100644 --- a/tests/app/main/views/test_add_service.py +++ b/tests/app/main/views/test_add_service.py @@ -9,7 +9,8 @@ def test_get_should_render_add_service_template(app_, db_session, active_user, mock_get_service, - mock_get_services): + mock_get_services, + mock_user_loader): with app_.test_request_context(): with app_.test_client() as client: client.login(active_user) @@ -22,7 +23,8 @@ def test_should_add_service_and_redirect_to_next_page(app_, db_, db_session, mock_create_service, - mock_get_services): + mock_get_services, + mock_user_loader): with app_.test_request_context(): with app_.test_client() as client: user = User.query.first() @@ -41,7 +43,8 @@ def test_should_return_form_errors_when_service_name_is_empty(app_, db_session, active_user, mock_get_service, - mock_get_services): + mock_get_services, + mock_user_loader): with app_.test_request_context(): with app_.test_client() as client: client.login(active_user) @@ -53,7 +56,8 @@ def test_should_return_form_errors_when_service_name_is_empty(app_, def test_should_return_form_errors_with_duplicate_service_name(app_, db_, db_session, - mock_get_services): + mock_get_services, + mock_user_loader): with app_.test_request_context(): with app_.test_client() as client: user = User.query.first() diff --git a/tests/app/main/views/test_api_keys.py b/tests/app/main/views/test_api_keys.py index 4b863f889..7fd61b19c 100644 --- a/tests/app/main/views/test_api_keys.py +++ b/tests/app/main/views/test_api_keys.py @@ -4,7 +4,8 @@ from flask import url_for def test_should_show_api_keys_and_documentation_page(app_, db_, db_session, - active_user): + active_user, + mock_user_loader): with app_.test_request_context(): with app_.test_client() as client: client.login(active_user) diff --git a/tests/app/main/views/test_code_not_received.py b/tests/app/main/views/test_code_not_received.py index 7dd27876d..bfb67d1ff 100644 --- a/tests/app/main/views/test_code_not_received.py +++ b/tests/app/main/views/test_code_not_received.py @@ -115,7 +115,7 @@ def test_should_update_mobile_number_resend_code(app_, data={'mobile_number': '+447700900460'}) assert response.status_code == 302 assert response.location == url_for('main.verify', _external=True) - assert mock_api_user.mobile_number == '+44 7700 900 460' + assert mock_api_user.mobile_number == '+447700900460' def test_should_render_verification_code_not_received(app_,