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

All tests passing and merged with master.

Browse Source
This commit is contained in:
Nicholas Staples
2016-01-27 16:30:33 +00:00
parent 6959d695d3 68891d8eb8
commit 2d35f5f36a
51 changed files with 763 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
tests/app/main/dao/__init__.py
View File

59
tests/app/main/dao/test_service_dao.py
View File

@@ -1,59 +0,0 @@
import pytest
import sqlalchemy
from app.main.dao import services_dao
def test_can_insert_new_service(api_user_active,
mock_create_service,
mock_user_dao_get_by_email):
service_name = 'testing service'
id_ = services_dao.insert_new_service(service_name, api_user_active.id)
mock_create_service.assert_called_once_with(
service_name, False, 1000, True, api_user_active.id)
def test_unrestrict_service_updates_the_service(mock_get_service,
mock_update_service,
mock_user_dao_get_by_email):
service_one = mock_get_service.side_effect(123)['data']
services_dao.unrestrict_service(service_one['id'])
mock_update_service.assert_called_once_with(service_one['id'],
service_one['name'],
service_one['active'],
service_one['limit'],
False,
service_one['users'])
def test_activate_service_update_service(api_user_active,
mock_get_service,
mock_update_service,
mock_user_dao_get_by_email):
service_one = mock_get_service.side_effect(123)['data']
services_dao.activate_service(service_one['id'])
mock_update_service.assert_called_once_with(service_one['id'],
service_one['name'],
True,
service_one['limit'],
service_one['restricted'],
service_one['users'])
def test_get_service_returns_none_if_service_does_not_exist(mock_get_service):
mock_get_service.side_effect = lambda x: None
service = services_dao.get_service_by_id(1)
assert service is None
def test_find_by_service_name_returns_right_service(mock_get_services):
service_name = "service_one"
service = services_dao.find_service_by_service_name(service_name)
assert mock_get_services.called
assert service['name'] == service_name
def test_should_return_list_of_service_names(mock_get_services):
expected = ['service_one', 'service_two']
actual = services_dao.find_all_service_names()
assert mock_get_services.called
assert actual == expected

229
tests/app/main/dao/test_users_dao.py
View File

@@ -1,229 +0,0 @@
from datetime import datetime
import pytest
import sqlalchemy
from app.main.encryption import check_hash
from app.main.dao import users_dao
@pytest.mark.xfail(reason='Tests will be moved to api')
def test_insert_user_should_add_user():
# user = User(name='test insert',
# password='somepassword',
# email_address='test@insert.gov.uk',
# mobile_number='+441234123412',
# role_id=1)
user = None
users_dao.insert_user(user)
saved_user = users_dao.get_user_by_id(user.id)
assert saved_user == user
@pytest.mark.xfail(reason='Tests will be moved to api')
def test_insert_user_with_role_that_does_not_exist_fails():
# user = User(name='role does not exist',
# password='somepassword',
# email_address='test@insert.gov.uk',
# mobile_number='+441234123412',
# role_id=100)
user = None
with pytest.raises(sqlalchemy.exc.IntegrityError) as error:
users_dao.insert_user(user)
assert 'insert or update on table "users" violates foreign key constraint "users_role_id_fkey"' in str(error.value)
@pytest.mark.xfail(reason='Not implemented yet on api client')
def test_get_user_by_email():
# user = User(name='test_get_by_email',
# password='somepassword',
# email_address='email@example.gov.uk',
# mobile_number='+441234153412',
# role_id=1)
user = None
users_dao.insert_user(user)
retrieved = users_dao.get_user_by_email(user.email_address)
assert retrieved == user
@pytest.mark.xfail(reason='Not implemented yet on api client')
def test_get_all_users_returns_all_users():
# user1 = User(name='test one',
# password='somepassword',
# email_address='test1@get_all.gov.uk',
# mobile_number='+441234123412',
# role_id=1)
# user2 = User(name='test two',
# password='some2ndpassword',
# email_address='test2@get_all.gov.uk',
# mobile_number='+441234123412',
# role_id=1)
# user3 = User(name='test three',
# password='some2ndpassword',
# email_address='test3@get_all.gov.uk',
# mobile_number='+441234123412',
# role_id=1)
user1 = None
user2 = None
user3 = None
users_dao.insert_user(user1)
users_dao.insert_user(user2)
users_dao.insert_user(user3)
users = users_dao.get_all_users()
assert len(users) == 3
assert users == [user1, user2, user3]
@pytest.mark.xfail(reason='Not implemented yet on api client')
def test_increment_failed_lockout_count_should_increade_count_by_1():
# user = User(name='cannot remember password',
# password='somepassword',
# email_address='test1@get_all.gov.uk',
# mobile_number='+441234123412',
# role_id=1)
user = None
users_dao.insert_user(user)
savedUser = users_dao.get_user_by_id(user.id)
assert savedUser.failed_login_count == 0
users_dao.increment_failed_login_count(user.id)
assert users_dao.get_user_by_id(user.id).failed_login_count == 1
@pytest.mark.xfail(reason='Not implemented yet on api client')
def test_user_is_locked_if_failed_login_count_is_10_or_greater():
# user = User(name='cannot remember password',
# password='somepassword',
# email_address='test1@get_all.gov.uk',
# mobile_number='+441234123412',
# role_id=1)
user = None
users_dao.insert_user(user)
saved_user = users_dao.get_user_by_id(user.id)
assert saved_user.is_locked() is False
for _ in range(10):
users_dao.increment_failed_login_count(user.id)
saved_user = users_dao.get_user_by_id(user.id)
assert saved_user.failed_login_count == 10
assert saved_user.is_locked() is True
@pytest.mark.xfail(reason='Not implemented yet on api client')
def test_user_is_active_is_false_if_state_is_inactive():
# user = User(name='inactive user',
# password='somepassword',
# email_address='test1@get_all.gov.uk',
# mobile_number='+441234123412',
# role_id=1,
# state='inactive')
user = None
users_dao.insert_user(user)
saved_user = users_dao.get_user_by_id(user.id)
assert saved_user.is_active() is False
def test_should_update_user_to_active(mock_activate_user):
from app.notify_client.user_api_client import User
user_data = {'name': 'Make user active',
'password': 'somepassword',
'email_address': 'activate@user.gov.uk',
'mobile_number': '+441234123412',
'state': 'pending'
}
user = User(user_data)
activated_user = users_dao.activate_user(user)
assert activated_user.state == 'active'
@pytest.mark.xfail(reason='Not implemented yet on api client')
def test_should_throws_error_when_id_does_not_exist():
with pytest.raises(AttributeError) as error:
users_dao.activate_user(123)
assert '''object has no attribute 'state''''' in str(error.value)
@pytest.mark.xfail(reason='Not implemented yet on api client')
def test_should_update_email_address():
# user = User(name='Update Email',
# password='somepassword',
# email_address='test@it.gov.uk',
# mobile_number='+441234123412',
# role_id=1,
# state='inactive')
user = None
users_dao.insert_user(user)
saved = users_dao.get_user_by_id(user.id)
assert saved.email_address == 'test@it.gov.uk'
users_dao.update_email_address(user.id, 'new_email@testit.gov.uk')
updated = users_dao.get_user_by_id(user.id)
assert updated.email_address == 'new_email@testit.gov.uk'
@pytest.mark.xfail(reason='Not implemented yet on api client')
def test_should_update_password():
# user = User(name='Update Email',
# password='somepassword',
# email_address='test@it.gov.uk',
# mobile_number='+441234123412',
# role_id=1,
# state='active')
user = None
start = datetime.now()
users_dao.insert_user(user)
saved = users_dao.get_user_by_id(user.id)
assert check_hash('somepassword', saved.password)
assert saved.password_changed_at is None
users_dao.update_password(saved, 'newpassword')
updated = users_dao.get_user_by_id(user.id)
assert check_hash('newpassword', updated.password)
assert updated.password_changed_at < datetime.now()
assert updated.password_changed_at > start
@pytest.mark.xfail(reason='Not implemented yet on api client')
def test_should_return_list_of_all_email_addresses():
# first = User(name='First Person',
# password='somepassword',
# email_address='first@it.gov.uk',
# mobile_number='+441234123412',
# role_id=1,
# state='active')
first = None
# second = User(name='Second Person',
# password='somepassword',
# email_address='second@it.gov.uk',
# mobile_number='+441234123412',
# role_id=1,
# state='active')
second = None
users_dao.insert_user(first)
users_dao.insert_user(second)
email_addresses = users_dao.get_all_users()
expected = [first.email_address, second.email_address]
assert expected == [x.email_address for x in email_addresses]
@pytest.mark.xfail(reason='Not implemented yet on api client')
def test_should_update_state_to_request_password_reset():
# user = User(name='Requesting Password Resest',
# password='somepassword',
# email_address='request@new_password.gov.uk',
# mobile_number='+441234123412',
# role_id=1,
# state='active')
user = None
users_dao.insert_user(user)
users_dao.request_password_reset(user.email_address)
saved = users_dao.get_user_by_email(user.email_address)
assert saved.state == 'request_password_reset'

27
tests/app/main/test_user.py Normal file
View File

@@ -0,0 +1,27 @@
from app.notify_client.user_api_client import User
def test_user():
user_data = {'id': 1,
'name': 'Test User',
'email_address': 'test@user.gov.uk',
'mobile_number': '+4412341234',
'state': 'pending',
'failed_login_count': 0
}
user = User(user_data)
assert user.id == 1
assert user.name == 'Test User'
assert user.email_address == 'test@user.gov.uk'
assert user.mobile_number == '+4412341234'
assert user.state == 'pending'
# user has three failed logins before being locked
assert user.max_failed_login_count == 3
assert user.failed_login_count == 0
assert not user.is_locked()
# set failed logins to threshold
user.failed_login_count = 3
assert user.is_locked()

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

@@ -2,7 +2,7 @@ from app.main.dao import users_dao
from app.main.forms import RegisterUserForm
def test_should_raise_validation_error_for_password(app_, mock_user_dao_get_by_email):
def test_should_raise_validation_error_for_password(app_, mock_get_user_by_email):
form = RegisterUserForm(users_dao.get_user_by_email)
form.name.data = 'test'
form.email_address.data = 'teset@example.gov.uk'

16
tests/app/main/views/test_add_service.py
View File

@@ -6,8 +6,8 @@ def test_get_should_render_add_service_template(app_,
api_user_active,
mock_get_service,
mock_get_services,
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:
@@ -21,8 +21,8 @@ def test_should_add_service_and_redirect_to_next_page(app_,
mock_create_service,
mock_get_services,
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:
@@ -40,8 +40,8 @@ def test_should_return_form_errors_when_service_name_is_empty(app_,
api_user_active,
mock_get_service,
mock_get_services,
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:
@@ -53,9 +53,9 @@ def test_should_return_form_errors_when_service_name_is_empty(app_,
def test_should_return_form_errors_with_duplicate_service_name(app_,
mock_get_services,
mock_user_loader,
mock_get_user,
api_user_active,
mock_user_dao_get_by_email,
mock_get_user_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:

28
tests/app/main/views/test_api_keys.py
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):

2
tests/app/main/views/test_choose_services.py
View File

@@ -4,7 +4,7 @@ import pytest
def test_should_show_choose_services_page(app_,
mock_user_dao_get_user,
mock_get_user,
api_user_active,
mock_get_services,
mock_login):

45
tests/app/main/views/test_code_not_received.py
View File

@@ -1,12 +1,10 @@
from tests import create_test_api_user
import pytest
from flask import url_for
def test_should_render_email_code_not_received_template_and_populate_email_address(app_,
mock_send_sms,
mock_send_email,
api_user_active,
mock_user_dao_get_by_email,
mock_get_user_by_email,
mock_send_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -22,11 +20,9 @@ def test_should_render_email_code_not_received_template_and_populate_email_addre
def test_should_check_and_resend_email_code_redirect_to_verify(app_,
mock_send_sms,
mock_send_email,
api_user_active,
mock_user_dao_get_by_email,
mock_user_dao_update_email,
mock_get_user_by_email,
mock_update_user,
mock_send_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -41,10 +37,8 @@ def test_should_check_and_resend_email_code_redirect_to_verify(app_,
def test_should_render_text_code_not_received_template(app_,
mock_send_sms,
mock_send_email,
api_user_active,
mock_user_dao_get_by_email,
mock_get_user_by_email,
mock_send_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -60,11 +54,9 @@ def test_should_render_text_code_not_received_template(app_,
def test_should_check_and_redirect_to_verify(app_,
mock_send_sms,
mock_send_email,
api_user_active,
mock_user_dao_get_by_email,
mock_user_dao_update_mobile,
mock_get_user_by_email,
mock_update_user,
mock_send_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -79,11 +71,9 @@ def test_should_check_and_redirect_to_verify(app_,
def test_should_update_email_address_resend_code(app_,
mock_send_sms,
mock_send_email,
api_user_active,
mock_user_dao_get_by_email,
mock_user_dao_update_email,
mock_get_user_by_email,
mock_update_user,
mock_send_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -95,15 +85,12 @@ def test_should_update_email_address_resend_code(app_,
data={'email_address': 'new@address.gov.uk'})
assert response.status_code == 302
assert response.location == url_for('main.verify', _external=True)
assert api_user_active.email_address == 'new@address.gov.uk'
def test_should_update_mobile_number_resend_code(app_,
mock_send_sms,
mock_send_email,
api_user_active,
mock_user_dao_get_by_email,
mock_user_dao_update_mobile,
mock_get_user_by_email,
mock_update_user,
mock_send_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -115,7 +102,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 api_user_active.mobile_number == '+447700900460'
api_user_active.mobile_number = '+447700900460'
def test_should_render_verification_code_not_received(app_,
@@ -136,9 +123,7 @@ def test_should_render_verification_code_not_received(app_,
def test_check_and_redirect_to_two_factor(app_,
api_user_active,
mock_send_sms,
mock_send_email,
mock_user_dao_get_by_email,
mock_get_user_by_email,
mock_send_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -153,9 +138,7 @@ def test_check_and_redirect_to_two_factor(app_,
def test_should_create_new_code_for_user(app_,
api_user_active,
mock_send_sms,
mock_send_email,
mock_user_dao_get_by_email,
mock_get_user_by_email,
mock_send_verify_code):
with app_.test_request_context():
with app_.test_client() as client:

5
tests/app/main/views/test_dashboard.py
View File

@@ -4,9 +4,10 @@ from flask import url_for
def test_should_show_recent_jobs_on_dashboard(app_,
api_user_active,
mock_get_service,
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:
client.login(api_user_active)

9
tests/app/main/views/test_forgot_password.py
View File

@@ -1,6 +1,4 @@
from flask import url_for
from app.main.dao import users_dao
from tests import create_test_user
def test_should_render_forgot_password(app_):
@@ -12,10 +10,10 @@ def test_should_render_forgot_password(app_):
def test_should_redirect_to_password_reset_sent_and_state_updated(app_,
mock_send_email,
api_user_active,
mock_user_dao_get_by_email,
mock_user_dao_password_reset):
mock_get_user_by_email,
mock_update_user,
mock_send_email):
with app_.test_request_context():
response = app_.test_client().post(
url_for('.forgot_password'),
@@ -24,4 +22,3 @@ def test_should_redirect_to_password_reset_sent_and_state_updated(app_,
assert (
'You have been sent an email containing a link'
' to reset your password.') in response.get_data(as_text=True)
assert api_user_active.state == 'request_password_reset'

16
tests/app/main/views/test_index.py Normal file
View File

@@ -0,0 +1,16 @@
from flask import url_for
def test_logged_in_user_redirects_to_choose_service(app_,
api_user_active,
mock_get_user,
mock_get_user_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
response = client.get(url_for('main.index'))
assert response.status_code == 302
response = client.get(url_for('main.sign_in', follow_redirects=True))
assert response.location == url_for('main.choose_service', _external=True)

13
tests/app/main/views/test_jobs.py
View File

@@ -1,12 +1,11 @@
from flask import url_for
from tests import create_test_user
def test_should_return_list_of_all_jobs(app_,
service_one,
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:
@@ -21,8 +20,8 @@ def test_should_show_page_for_one_job(app_,
service_one,
api_user_active,
mock_login,
mock_user_loader,
mock_user_dao_get_by_email):
mock_get_user,
mock_get_user_by_email):
with app_.test_request_context():
with app_.test_client() as client:
# TODO filename will be part of job metadata not in session
@@ -39,8 +38,8 @@ def test_should_show_page_for_one_job(app_,
def test_should_show_page_for_one_notification(app_,
service_one,
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:

64
tests/app/main/views/test_new_password.py
View File

@@ -3,75 +3,71 @@ from flask import url_for
from app.main.dao import users_dao
from app.main.encryption import check_hash
from app.notify_client.sender import generate_token
from tests import create_test_user
import pytest
def test_should_render_new_password_template(app_,
api_user_active,
mock_user_dao_get_new_password,
mock_login):
mock_login,
mock_send_verify_code,
mock_get_user_by_email_request_password_reset):
with app_.test_request_context():
with app_.test_client() as client:
token = generate_token(api_user_active.email_address)
response = client.get(url_for('.new_password', token=token))
print(response.location)
assert response.status_code == 200
assert ' You can now create a new password for your account.' in response.get_data(as_text=True)
# def test_should_render_new_password_template_with_message_of_bad_token(app_,
# mock_user_dao_get_by_email):
# with app_.test_request_context():
# with app_.test_client() as client:
# create_test_user('request_password_reset')
# token = generate_token('no_user@d.gov.uk')
# response = client.get(url_for('.new_password', token=token))
# assert response.status_code == 200
# assert 'Message about email address does not exist. Some one needs to figure out the words here.' in \
# response.get_data(as_text=True)
@pytest.mark.skipif(True, reason='Password reset no implemented')
def test_should_render_new_password_template_with_message_of_bad_token(app_,
mock_get_user_by_email):
with app_.test_request_context():
with app_.test_client() as client:
token = generate_token('no_user@d.gov.uk')
response = client.get(url_for('.new_password', token=token))
assert response.status_code == 200
assert 'Message about email address does not exist. Some one needs to figure out the words here.' in \
response.get_data(as_text=True)
@pytest.mark.xfail(reason='Password reset not implemented')
@pytest.mark.skipif(True, reason='Password reset no implemented')
def test_should_redirect_to_two_factor_when_password_reset_is_successful(app_,
mock_send_sms,
api_user_active,
mock_user_dao_get_new_password,
mock_get_user_by_email_request_password_reset,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
api_user_active.state = 'request_password_reset'
token = generate_token(api_user_active.email_address)
user = mock_get_user_by_email_request_password_reset.return_value
token = generate_token(user.email_address)
response = client.post(url_for('.new_password', token=token), data={'new_password': 'a-new_password'})
assert response.status_code == 302
assert response.location == url_for('.two_factor', _external=True)
saved_user = users_dao.get_user_by_id(user.id)
assert check_hash('a-new_password', saved_user.password)
assert saved_user.state == 'active'
def test_should_redirect_to_forgot_password_with_flash_message_when_token_is_expired(app_,
api_user_active,
mock_login):
def test_should_redirect_to_forgot_password_with_flash_message_when_token_is_expired(
app_, mock_get_user_by_email_request_password_reset, mock_login
):
with app_.test_request_context():
with app_.test_client() as client:
app_.config['TOKEN_MAX_AGE_SECONDS'] = -1000
api_user_active.state = 'request_password_reset'
token = generate_token(api_user_active.email_address)
user = mock_get_user_by_email_request_password_reset.return_value
token = generate_token(user.email_address)
response = client.post(url_for('.new_password', token=token), data={'new_password': 'a-new_password'})
assert response.status_code == 302
assert response.location == url_for('.forgot_password', _external=True)
app_.config['TOKEN_MAX_AGE_SECONDS'] = 3600
@pytest.mark.xfail(reason='Password reset not implemented')
def test_should_redirect_to_forgot_pass_when_user_active_should_be_request_passw_reset(app_,
api_user_active,
mock_user_dao_get_by_email,
mock_login):
@pytest.mark.skipif(True, reason='Password reset no implemented')
def test_should_redirect_to_forgot_pass_when_user_active_should_be_request_passw_reset(
app_, mock_get_user_by_email_request_password_reset, mock_login
):
with app_.test_request_context():
with app_.test_client() as client:
api_user_active.state = 'request_password_reset'
token = generate_token(api_user_active.email_address)
user = mock_get_user_by_email_request_password_reset.return_value
token = generate_token(user.email_address)
response = client.post(url_for('.new_password', token=token), data={'new_password': 'a-new_password'})
assert response.status_code == 302
assert response.location == url_for('.index', _external=True)

86
tests/app/main/views/test_register.py
View File

@@ -1,43 +1,58 @@
from flask import url_for
from tests.conftest import mock_register_user as mock_user
def test_render_register_returns_template_with_form(app_):
response = app_.test_client().get('/register')
assert response.status_code == 200
assert 'Create an account' in response.get_data(as_text=True)
# def test_render_register_returns_template_with_form(app_, db_, db_session):
# response = app_.test_client().get('/register')
def test_logged_in_user_redirects_to_choose_service(app_,
api_user_active,
mock_get_user_by_email,
mock_send_verify_code,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
response = client.get(url_for('main.register'))
assert response.status_code == 302
# assert response.status_code == 200
# assert 'Create an account' in response.get_data(as_text=True)
response = client.get(url_for('main.sign_in', follow_redirects=True))
assert response.location == url_for('main.choose_service', _external=True)
def test_process_register_creates_new_user(app_,
mock_send_verify_code,
mock_register_user,
mock_user_by_email_not_found,
mock_get_user_by_email_not_found,
mock_login):
user_data = {
'name': 'Some One Valid',
'email_address': 'someone@example.gov.uk',
'email_address': 'notfound@example.gov.uk',
'mobile_number': '+4407700900460',
'password': 'validPassword!'
}
with app_.test_request_context():
response = app_.test_client().post('/register',
response = app_.test_client().post(url_for('main.register'),
data=user_data)
assert response.status_code == 302
assert response.location == url_for('main.verify', _external=True)
assert mock_register_user.called
def test_process_register_returns_400_when_mobile_number_is_invalid(app_,
mock_send_verify_code,
mock_user_by_email_not_found,
mock_get_user_by_email_not_found,
mock_login):
response = app_.test_client().post('/register',
data={'name': 'Bad Mobile',
'email_address': 'bad_mobile@example.gov.uk',
'mobile_number': 'not good',
'password': 'validPassword!'})
with app_.test_request_context():
response = app_.test_client().post(url_for('main.register'),
data={'name': 'Bad Mobile',
'email_address': 'bad_mobile@example.gov.uk',
'mobile_number': 'not good',
'password': 'validPassword!'})
assert response.status_code == 200
assert 'Must be a UK mobile number (eg 07700 900460)' in response.get_data(as_text=True)
@@ -45,13 +60,14 @@ def test_process_register_returns_400_when_mobile_number_is_invalid(app_,
def test_should_return_400_when_email_is_not_gov_uk(app_,
mock_send_verify_code,
mock_user_by_email_not_found,
mock_get_user_by_email,
mock_login):
response = app_.test_client().post('/register',
data={'name': 'Bad Mobile',
'email_address': 'bad_mobile@example.not.right',
'mobile_number': '+44123412345',
'password': 'validPassword!'})
with app_.test_request_context():
response = app_.test_client().post(url_for('main.register'),
data={'name': 'Bad Mobile',
'email_address': 'bad_mobile@example.not.right',
'mobile_number': '+44123412345',
'password': 'validPassword!'})
assert response.status_code == 200
assert 'Enter a gov.uk email address' in response.get_data(as_text=True)
@@ -60,31 +76,33 @@ def test_should_return_400_when_email_is_not_gov_uk(app_,
def test_should_add_verify_codes_on_session(app_,
mock_send_verify_code,
mock_register_user,
mock_user_loader,
mock_user_by_email_not_found,
mock_get_user,
mock_get_user_by_email_not_found,
mock_login):
user_data = {
'name': 'Test Codes',
'email_address': 'test@example.gov.uk',
'email_address': 'notfound@example.gov.uk',
'mobile_number': '+4407700900460',
'password': 'validPassword!'
}
with app_.test_client() as client:
response = client.post('/register',
data=user_data)
assert response.status_code == 302
assert 'notify_admin_session' in response.headers.get('Set-Cookie')
with app_.test_request_context():
with app_.test_client() as client:
response = client.post(url_for('main.register'),
data=user_data)
assert response.status_code == 302
assert 'notify_admin_session' in response.headers.get('Set-Cookie')
def test_should_return_400_if_password_is_blacklisted(app_,
mock_user_by_email_not_found,
mock_get_user_by_email,
mock_login):
response = app_.test_client().post('/register',
data={'name': 'Bad Mobile',
'email_address': 'bad_mobile@example.not.right',
'mobile_number': '+44123412345',
'password': 'password1234'})
with app_.test_request_context():
response = app_.test_client().post(url_for('main.register'),
data={'name': 'Bad Mobile',
'email_address': 'bad_mobile@example.not.right',
'mobile_number': '+44123412345',
'password': 'password1234'})
response.status_code == 200
assert 'That password is blacklisted, too common' in response.get_data(as_text=True)

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

@@ -4,8 +4,8 @@ from flask import (url_for, session)
def test_should_show_overview(app_,
api_user_active,
mock_get_service,
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:
@@ -23,8 +23,8 @@ def test_should_show_overview(app_,
def test_should_show_service_name(app_,
api_user_active,
mock_get_service,
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:
@@ -42,8 +42,8 @@ def test_should_show_service_name(app_,
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_get_user,
mock_get_user_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
@@ -62,8 +62,8 @@ def test_should_redirect_after_change_service_name(app_,
def test_should_show_service_name_confirmation(app_,
api_user_active,
mock_get_service,
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:
@@ -82,8 +82,8 @@ def test_should_redirect_after_service_name_confirmation(app_,
api_user_active,
mock_get_service,
mock_update_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_login,
mock_verify_password):
with app_.test_request_context():
@@ -108,8 +108,8 @@ def test_should_redirect_after_service_name_confirmation(app_,
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_get_user,
mock_get_user_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
@@ -128,8 +128,8 @@ def test_should_redirect_after_request_to_go_live(app_,
api_user_active,
mock_get_service,
mock_update_service,
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:
@@ -149,8 +149,8 @@ def test_should_redirect_after_request_to_go_live(app_,
def test_should_show_status_page(app_,
api_user_active,
mock_get_service,
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:
@@ -168,8 +168,8 @@ def test_should_show_status_page(app_,
def test_should_show_redirect_after_status_change(app_,
api_user_active,
mock_get_service,
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:
@@ -188,8 +188,8 @@ def test_should_show_redirect_after_status_change(app_,
def test_should_show_status_confirmation(app_,
api_user_active,
mock_get_service,
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:
@@ -208,8 +208,8 @@ def test_should_redirect_after_status_confirmation(app_,
api_user_active,
mock_get_service,
mock_update_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_login,
mock_verify_password):
with app_.test_request_context():
@@ -230,8 +230,8 @@ def test_should_redirect_after_status_confirmation(app_,
def test_should_show_delete_page(app_,
api_user_active,
mock_get_service,
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:
@@ -248,8 +248,8 @@ def test_should_show_delete_page(app_,
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_get_user,
mock_get_user_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
@@ -267,8 +267,8 @@ def test_should_show_redirect_after_deleting_service(app_,
def test_should_show_delete_confirmation(app_,
api_user_active,
mock_get_service,
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:
@@ -286,8 +286,8 @@ def test_should_redirect_delete_confirmation(app_,
api_user_active,
mock_get_service,
mock_delete_service,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_login,
mock_verify_password):
with app_.test_request_context():

105
tests/app/main/views/test_sign_in.py
View File

@@ -1,9 +1,9 @@
from datetime import datetime
from app.main.dao import users_dao
from flask import url_for
import pytest
from flask import url_for
def test_render_sign_in_returns_sign_in_template(app_):
@@ -16,11 +16,26 @@ def test_render_sign_in_returns_sign_in_template(app_):
assert 'Forgotten password?' in response.get_data(as_text=True)
def test_logged_in_user_redirects_to_choose_service(app_,
api_user_active,
mock_get_user_by_email,
mock_login):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
response = client.get(url_for('main.sign_in'))
assert response.status_code == 302
response = client.get(url_for('main.sign_in', follow_redirects=True))
assert response.location == url_for('main.choose_service', _external=True)
def test_process_sign_in_return_2fa_template(app_,
mock_send_verify_code,
mock_get_user,
mock_get_user_by_email,
mock_verify_password):
with app_.test_request_context():
response = app_.test_client().post(
url_for('main.sign_in'), data={
@@ -30,72 +45,44 @@ def test_process_sign_in_return_2fa_template(app_,
assert response.location == 'http://localhost/two-factor'
@pytest.mark.xfail(reason='User failed logins not implemented yet')
def test_should_return_locked_out_true_when_user_is_locked(app_,
mock_user_dao_get_user,
mock_inactive_user_dao_get_by_email):
mock_get_user_by_email_locked):
with app_.test_request_context():
for _ in range(10):
app_.test_client().post(
url_for('main.sign_in'), data={
'email_address': 'valid@example.gov.uk',
'password': 'whatIsMyPassword!'})
response = app_.test_client().post(
url_for('main.sign_in'), data={
'email_address': 'valid@example.gov.uk',
'password': 'val1dPassw0rd!'})
assert response.status_code == 200
assert 'Username or password is incorrect' in response.get_data(as_text=True)
another_bad_attempt = app_.test_client().post(
resp = app_.test_client().post(
url_for('main.sign_in'), data={
'email_address': 'valid@example.gov.uk',
'password': 'whatIsMyPassword!'})
assert another_bad_attempt.status_code == 200
assert 'Username or password is incorrect' in response.get_data(as_text=True)
assert resp.status_code == 200
assert 'Username or password is incorrect' in resp.get_data(as_text=True)
# @pytest.mark.xfail(reason='User failed logins not implemented yet')
# def test_should_return_active_user_is_false_if_user_is_inactive(app_,
# mock_user_dao_get_user,
# mock_inactive_user_dao_get_by_email):
# with app_.test_request_context():
# response = app_.test_client().post(
# url_for('main.sign_in'), data={
# 'email_address': 'inactive_user@example.gov.uk',
# 'password': 'val1dPassw0rd!'})
def test_should_return_active_user_is_false_if_user_is_inactive(app_, mock_get_user_by_email_inactive):
# assert response.status_code == 200
# assert 'Username or password is incorrect' in response.get_data(as_text=True)
with app_.test_request_context():
response = app_.test_client().post(
url_for('main.sign_in'), data={
'email_address': 'inactive_user@example.gov.uk',
'password': 'val1dPassw0rd!'})
assert response.status_code == 200
assert 'Username or password is incorrect' in response.get_data(as_text=True)
# def test_should_return_200_when_user_does_not_exist(app_,
# mock_user_dao_get_user,
# mock_user_dao_get_by_email):
# with app_.test_request_context():
# response = app_.test_client().post(
# url_for('main.sign_in'), data={
# 'email_address': 'does_not_exist@gov.uk',
# 'password': 'doesNotExist!'})
# assert response.status_code == 200
# assert 'Username or password is incorrect' in response.get_data(as_text=True)
def test_should_return_200_when_user_does_not_exist(app_, mock_get_user_by_email_not_found):
with app_.test_request_context():
response = app_.test_client().post(
url_for('main.sign_in'), data={
'email_address': 'notfound@gov.uk',
'password': 'doesNotExist!'})
assert response.status_code == 200
assert 'Username or password is incorrect' in response.get_data(as_text=True)
# def test_should_return_200_when_user_is_not_active(app_):
# user = User(email_address='PendingUser@example.gov.uk',
# password='val1dPassw0rd!',
# mobile_number='+441234123123',
# name='pending user',
# created_at=datetime.now(),
# role_id=1,
# state='pending')
# users_dao.insert_user(user)
# with app_.test_request_context():
# response = app_.test_client().post(
# url_for('main.sign_in'), data={
# 'email_address': 'PendingUser@example.gov.uk',
# 'password': 'val1dPassw0rd!'})
# assert response.status_code == 200
# assert 'Username or password is incorrect' in response.get_data(as_text=True)
def test_should_return_200_when_user_is_pending(app_, mock_get_user_by_email_pending):
with app_.test_request_context():
response = app_.test_client().post(
url_for('main.sign_in'), data={
'email_address': 'pending_user@example.gov.uk',
'password': 'val1dPassw0rd!'})
assert response.status_code == 200
assert 'Username or password is incorrect' in response.get_data(as_text=True)

6
tests/app/main/views/test_sign_out.py
View File

@@ -13,12 +13,10 @@ def test_render_sign_out_redirects_to_sign_in(app_):
def test_sign_out_user(app_,
mock_send_sms,
mock_send_email,
mock_get_service,
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():
email = 'valid@example.gov.uk'

23
tests/app/main/views/test_sms.py
View File

@@ -6,9 +6,9 @@ import moto
def test_upload_empty_csvfile_returns_to_upload_page(app_,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_login):
mock_get_user,
mock_get_service_templates,
mock_check_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -25,8 +25,8 @@ def test_upload_empty_csvfile_returns_to_upload_page(app_,
def test_upload_csvfile_with_invalid_phone_shows_check_page_with_errors(app_,
mocker,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_login):
contents = 'phone\n+44 123\n+44 456'
@@ -51,10 +51,9 @@ def test_upload_csvfile_with_invalid_phone_shows_check_page_with_errors(app_,
def test_upload_csvfile_with_valid_phone_shows_first3_and_last3_numbers(app_,
mocker,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_login):
contents = 'phone\n+44 7700 900981\n+44 7700 900982\n+44 7700 900983\n+44 7700 900984\n+44 7700 900985\n+44 7700 900986\n+44 7700 900987\n+44 7700 900988\n+44 7700 900989' # noqa
file_data = (BytesIO(contents.encode('utf-8')), 'valid.csv')
@@ -88,8 +87,8 @@ def test_upload_csvfile_with_valid_phone_shows_first3_and_last3_numbers(app_,
def test_upload_csvfile_with_valid_phone_shows_all_if_6_or_less_numbers(app_,
mocker,
api_user_active,
mock_user_loader,
mock_user_dao_get_by_email,
mock_get_user,
mock_get_user_by_email,
mock_login):
contents = 'phone\n+44 7700 900981\n+44 7700 900982\n+44 7700 900983\n+44 7700 900984\n+44 7700 900985\n+44 7700 900986' # noqa
@@ -120,8 +119,8 @@ def test_upload_csvfile_with_valid_phone_shows_all_if_6_or_less_numbers(app_,
@moto.mock_s3
def test_should_redirect_to_job(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:

22
tests/app/main/views/test_templates.py
View File

@@ -5,8 +5,8 @@ from flask import url_for
def test_should_return_list_of_all_templates(app_,
api_user_active,
mock_get_service_templates,
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:
@@ -22,8 +22,8 @@ def test_should_return_list_of_all_templates(app_,
def test_should_show_page_for_one_templates(app_,
api_user_active,
mock_get_service_template,
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:
@@ -36,6 +36,8 @@ def test_should_show_page_for_one_templates(app_,
template_id=template_id))
assert response.status_code == 200
assert "Two week reminder" in response.get_data(as_text=True)
assert "Your vehicle tax is about to expire" in response.get_data(as_text=True)
mock_get_service_template.assert_called_with(
service_id, template_id)
@@ -44,8 +46,8 @@ def test_should_redirect_when_saving_a_template(app_,
api_user_active,
mock_get_service_template,
mock_update_service_template,
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:
@@ -77,8 +79,8 @@ def test_should_redirect_when_saving_a_template(app_,
def test_should_show_delete_template_page(app_,
api_user_active,
mock_get_service_template,
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:
@@ -100,8 +102,8 @@ def test_should_redirect_when_deleting_a_template(app_,
api_user_active,
mock_get_service_template,
mock_delete_service_template,
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:

10
tests/app/main/views/test_two_factor.py
View File

@@ -1,11 +1,11 @@
from flask import json, url_for
from flask import url_for
from tests import create_test_user
def test_should_render_two_factor_page(app_,
api_user_active,
mock_user_dao_get_by_email):
mock_get_user_by_email):
with app_.test_request_context():
with app_.test_client() as client:
# TODO this lives here until we work out how to
@@ -22,7 +22,7 @@ def test_should_render_two_factor_page(app_,
def test_should_login_user_and_redirect_to_dashboard(app_,
api_user_active,
mock_get_user,
mock_user_dao_get_by_email,
mock_get_user_by_email,
mock_check_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -39,7 +39,7 @@ def test_should_login_user_and_redirect_to_dashboard(app_,
def test_should_return_200_with_sms_code_error_when_sms_code_is_wrong(app_,
api_user_active,
mock_user_dao_get_by_email,
mock_get_user_by_email,
mock_check_verify_code_code_not_found):
with app_.test_request_context():
with app_.test_client() as client:
@@ -56,7 +56,7 @@ def test_should_return_200_with_sms_code_error_when_sms_code_is_wrong(app_,
def test_should_login_user_when_multiple_valid_codes_exist(app_,
api_user_active,
mock_get_user,
mock_user_dao_get_by_email,
mock_get_user_by_email,
mock_check_verify_code):
with app_.test_request_context():
with app_.test_client() as client:

34
tests/app/main/views/test_user_profile.py
View File

@@ -5,7 +5,7 @@ from flask import url_for
def test_should_show_overview_page(app_,
api_user_active,
mock_login,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -18,7 +18,7 @@ def test_should_show_overview_page(app_,
def test_should_show_name_page(app_,
api_user_active,
mock_login,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -32,7 +32,7 @@ def test_should_redirect_after_name_change(app_,
api_user_active,
mock_login,
mock_update_user,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -51,7 +51,7 @@ def test_should_redirect_after_name_change(app_,
def test_should_show_email_page(app_,
api_user_active,
mock_login,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -65,7 +65,7 @@ def test_should_show_email_page(app_,
def test_should_redirect_after_email_change(app_,
api_user_active,
mock_login,
mock_user_dao_get_user,
mock_get_user,
mock_get_user_by_email_not_found):
with app_.test_request_context():
with app_.test_client() as client:
@@ -83,8 +83,8 @@ def test_should_redirect_after_email_change(app_,
def test_should_show_authenticate_after_email_change(app_,
api_user_active,
mock_login,
mock_user_dao_get_user,
mock_user_dao_checkpassword):
mock_get_user,
mock_verify_password):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -100,7 +100,7 @@ def test_should_show_authenticate_after_email_change(app_,
def test_should_redirect_after_email_change_confirm(app_,
api_user_active,
mock_login,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -119,7 +119,7 @@ def test_should_redirect_after_email_change_confirm(app_,
def test_should_show_confirm_after_email_change(app_,
api_user_active,
mock_login,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -135,7 +135,7 @@ def test_should_show_confirm_after_email_change(app_,
def test_should_redirect_after_email_change_confirm(app_,
api_user_active,
mock_login,
mock_user_dao_get_user,
mock_get_user,
mock_check_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -156,7 +156,7 @@ def test_should_redirect_after_email_change_confirm(app_,
def test_should_show_mobile_number_page(app_,
api_user_active,
mock_login,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -169,7 +169,7 @@ def test_should_show_mobile_number_page(app_,
def test_should_redirect_after_mobile_number_change(app_,
api_user_active,
mock_login,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -185,7 +185,7 @@ def test_should_redirect_after_mobile_number_change(app_,
def test_should_show_authenticate_after_mobile_number_change(app_,
api_user_active,
mock_login,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -202,7 +202,7 @@ def test_should_show_authenticate_after_mobile_number_change(app_,
def test_should_redirect_after_mobile_number_authenticate(app_,
api_user_active,
mock_login,
mock_user_dao_get_user,
mock_get_user,
mock_verify_password):
with app_.test_request_context():
with app_.test_client() as client:
@@ -222,7 +222,7 @@ def test_should_redirect_after_mobile_number_authenticate(app_,
def test_should_show_confirm_after_mobile_number_change(app_,
api_user_active,
mock_login,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -239,7 +239,7 @@ def test_should_show_confirm_after_mobile_number_change(app_,
def test_should_redirect_after_mobile_number_confirm(app_,
api_user_active,
mock_login,
mock_user_dao_get_user,
mock_get_user,
mock_check_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -260,7 +260,7 @@ def test_should_redirect_after_mobile_number_confirm(app_,
def test_should_show_password_page(app_,
api_user_active,
mock_login,
mock_user_dao_get_user):
mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)

52
tests/app/main/views/test_verify.py
View File

@@ -23,9 +23,8 @@ def test_should_return_verify_template(app_,
def test_should_redirect_to_add_service_when_code_are_correct(app_,
api_user_active,
mock_user_dao_get_user,
mock_activate_user,
mock_user_loader,
mock_get_user,
mock_update_user,
mock_check_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -38,22 +37,25 @@ def test_should_redirect_to_add_service_when_code_are_correct(app_,
assert response.location == url_for('main.add_service', first='first', _external=True)
# def test_should_activate_user_after_verify(app_, api_user_active, mock_activate_user):
# with app_.test_request_context():
# with app_.test_client() as client:
# with client.session_transaction() as session:
# session['user_details'] = {'email_address': api_user_active.email_address, 'id': api_user_active.id}
# verify_codes_dao.add_code(user_id=api_user_active.id, code='12345', code_type='sms')
# verify_codes_dao.add_code(user_id=api_user_active.id, code='23456', code_type='email')
# client.post(url_for('main.verify'),
# data={'sms_code': '12345',
# 'email_code': '23456'})
# assert api_user_active.state == 'active'
def test_should_activate_user_after_verify(app_,
api_user_active,
mock_get_user,
mock_send_verify_code,
mock_check_verify_code,
mock_update_user):
with app_.test_request_context():
with app_.test_client() as client:
with client.session_transaction() as session:
session['user_details'] = {'email_address': api_user_active.email_address, 'id': api_user_active.id}
client.post(url_for('main.verify'),
data={'sms_code': '12345',
'email_code': '23456'})
assert mock_update_user.called
def test_should_return_200_when_codes_are_wrong(app_,
api_user_active,
mock_user_dao_get_user,
mock_get_user,
mock_check_verify_code_code_not_found):
with app_.test_request_context():
with app_.test_client() as client:
@@ -65,23 +67,3 @@ def test_should_return_200_when_codes_are_wrong(app_,
assert response.status_code == 200
resp_data = response.get_data(as_text=True)
assert resp_data.count('Code not found') == 2
# def test_should_mark_all_codes_as_used_when_many_codes_exist(app_,
# api_user_active):
# with app_.test_request_context():
# with app_.test_client() as client:
# with client.session_transaction() as session:
# session['user_details'] = {'email_address': api_user_active.email_address, 'id': api_user_active.id}
# code1 = verify_codes_dao.add_code(user_id=api_user_active.id, code='23345', code_type='sms')
# code2 = verify_codes_dao.add_code(user_id=api_user_active.id, code='98456', code_type='email')
# code3 = verify_codes_dao.add_code(user_id=api_user_active.id, code='12345', code_type='sms')
# code4 = verify_codes_dao.add_code(user_id=api_user_active.id, code='23412', code_type='email')
# response = client.post(url_for('main.verify'),
# data={'sms_code': '23345',
# 'email_code': '23412'})
# assert response.status_code == 302
# assert verify_codes_dao.get_code_by_id(code1).code_used is True
# assert verify_codes_dao.get_code_by_id(code2).code_used is True
# assert verify_codes_dao.get_code_by_id(code3).code_used is True
# assert verify_codes_dao.get_code_by_id(code4).code_used is True