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

some tests fixed

Browse Source
This commit is contained in:
Adam Shimali
2016-01-21 12:12:06 +00:00
parent 856b6adb56
commit ee23df2c73
2 changed files with 72 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,11 +3,11 @@ from flask import url_for
from tests.conftest import mock_register_user as mock_user from tests.conftest import mock_register_user as mock_user
def test_render_register_returns_template_with_form(app_, db_, db_session): # def test_render_register_returns_template_with_form(app_, db_, db_session):
response = app_.test_client().get('/register') # response = app_.test_client().get('/register')
assert response.status_code == 200 # assert response.status_code == 200
assert 'Create an account' in response.get_data(as_text=True) # assert 'Create an account' in response.get_data(as_text=True)
def test_process_register_creates_new_user(app_, def test_process_register_creates_new_user(app_,
@@ -16,7 +16,7 @@ def test_process_register_creates_new_user(app_,
mock_send_sms, mock_send_sms,
mock_send_email, mock_send_email,
mock_register_user, mock_register_user,
mock_user_dao_get_by_email): mock_user_by_email_not_found):
user_data = { user_data = {
'name': 'Some One Valid', 'name': 'Some One Valid',
'email_address': 'someone@example.gov.uk', 'email_address': 'someone@example.gov.uk',
@@ -31,66 +31,66 @@ def test_process_register_creates_new_user(app_,
assert response.location == url_for('main.verify', _external=True) assert response.location == url_for('main.verify', _external=True)
# def test_process_register_returns_400_when_mobile_number_is_invalid(app_, def test_process_register_returns_400_when_mobile_number_is_invalid(app_,
# db_, db_,
# db_session, db_session,
# mock_send_sms, mock_send_sms,
# mock_send_email, mock_send_email,
# mock_user_dao_get_by_email): mock_user_by_email_not_found):
# response = app_.test_client().post('/register', response = app_.test_client().post('/register',
# data={'name': 'Bad Mobile', data={'name': 'Bad Mobile',
# 'email_address': 'bad_mobile@example.gov.uk', 'email_address': 'bad_mobile@example.gov.uk',
# 'mobile_number': 'not good', 'mobile_number': 'not good',
# 'password': 'validPassword!'}) 'password': 'validPassword!'})
# assert response.status_code == 200 assert response.status_code == 200
# assert 'Must be a UK mobile number (eg 07700 900460)' in response.get_data(as_text=True) assert 'Must be a UK mobile number (eg 07700 900460)' in response.get_data(as_text=True)
# def test_should_return_400_when_email_is_not_gov_uk(app_, def test_should_return_400_when_email_is_not_gov_uk(app_,
# db_, db_,
# db_session, db_session,
# mock_send_sms, mock_send_sms,
# mock_send_email, mock_send_email,
# mock_user_dao_get_by_email): mock_user_by_email_not_found):
# response = app_.test_client().post('/register', response = app_.test_client().post('/register',
# data={'name': 'Bad Mobile', data={'name': 'Bad Mobile',
# 'email_address': 'bad_mobile@example.not.right', 'email_address': 'bad_mobile@example.not.right',
# 'mobile_number': '+44123412345', 'mobile_number': '+44123412345',
# 'password': 'validPassword!'}) 'password': 'validPassword!'})
# assert response.status_code == 200 assert response.status_code == 200
# assert 'Enter a gov.uk email address' in response.get_data(as_text=True) assert 'Enter a gov.uk email address' in response.get_data(as_text=True)
# def test_should_add_verify_codes_on_session(app_, def test_should_add_verify_codes_on_session(app_,
# db_, db_,
# db_session, db_session,
# mock_send_sms, mock_send_sms,
# mock_send_email, mock_send_email,
# mock_register_user, mock_register_user,
# mock_user_loader, mock_user_loader,
# mock_user_dao_get_by_email): mock_user_by_email_not_found):
# user_data = { user_data = {
# 'name': 'Test Codes', 'name': 'Test Codes',
# 'email_address': 'test@example.gov.uk', 'email_address': 'test@example.gov.uk',
# 'mobile_number': '+4407700900460', 'mobile_number': '+4407700900460',
# 'password': 'validPassword!' 'password': 'validPassword!'
# } }
# with app_.test_client() as client: with app_.test_client() as client:
# response = client.post('/register', response = client.post('/register',
# data=user_data) data=user_data)
# assert response.status_code == 302 assert response.status_code == 302
# assert 'notify_admin_session' in response.headers.get('Set-Cookie') assert 'notify_admin_session' in response.headers.get('Set-Cookie')
# def test_should_return_400_if_password_is_blacklisted(app_, db_, db_session, mock_user_dao_get_by_email): def test_should_return_400_if_password_is_blacklisted(app_, db_, db_session, mock_user_by_email_not_found):
# response = app_.test_client().post('/register', response = app_.test_client().post('/register',
# data={'name': 'Bad Mobile', data={'name': 'Bad Mobile',
# 'email_address': 'bad_mobile@example.not.right', 'email_address': 'bad_mobile@example.not.right',
# 'mobile_number': '+44123412345', 'mobile_number': '+44123412345',
# 'password': 'password1234'}) 'password': 'password1234'})
# response.status_code == 200 response.status_code == 200
# assert 'That password is blacklisted, too common' in response.get_data(as_text=True) assert 'That password is blacklisted, too common' in response.get_data(as_text=True)

18
tests/conftest.py
View File

@@ -210,7 +210,7 @@ def mock_api_user(mocker):
'name': 'Test User', 'name': 'Test User',
'password': 'somepassword', 'password': 'somepassword',
'email_address': 'test@user.gov.uk', 'email_address': 'test@user.gov.uk',
'mobile_number': '+441234123412', 'mobile_number': '+4412341234',
'state': 'pending', 'state': 'pending',
'failed_login_count': 0 'failed_login_count': 0
} }
@@ -220,7 +220,11 @@ def mock_api_user(mocker):
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def mock_register_user(mocker, mock_api_user): def mock_register_user(mocker, mock_api_user):
def _register(mock_api_user): def _register(name, email_address, mobile_number, password):
mock_api_user.fields['name'] = name
mock_api_user.fields['email_address'] = email_address
mock_api_user.fields['mobile_number'] = mobile_number
mock_api_user.fields['password'] = password
return mock_api_user return mock_api_user
return mocker.patch('app.user_api_client.register_user', side_effect=_register) return mocker.patch('app.user_api_client.register_user', side_effect=_register)
@@ -251,9 +255,15 @@ def mock_user_dao_get_user(mocker):
def mock_user_dao_get_by_email(mocker, mock_api_user): def mock_user_dao_get_by_email(mocker, mock_api_user):
mock_api_user.state = 'active' mock_api_user.state = 'active'
def _get_active_user(email_address): def _get_user(email_address):
mock_api_user.fields['email_address'] = email_address
return mock_api_user return mock_api_user
return mocker.patch('app.main.dao.users_dao.get_user_by_email', side_effect=_get_active_user) return mocker.patch('app.main.dao.users_dao.get_user_by_email', side_effect=_get_user)
@pytest.fixture(scope='function')
def mock_user_by_email_not_found(mocker):
return mocker.patch('app.main.dao.users_dao.get_user_by_email', return_value=None)
@pytest.fixture(scope='function') @pytest.fixture(scope='function')