darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-permissions

Browse Source 
Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py
This commit is contained in:
Rebecca Law
2016-03-30 10:36:55 +01:00
parent 1cfaeec7b2 1a8d4fda69
commit c99df69025
25 changed files with 132 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/app/main/test_two_factor_form.py
View File

@@ -1,15 +1,14 @@
from datetime import datetime, timedelta
from app.main.forms import TwoFactorForm
from app.main.dao import users_dao
from tests import create_test_user
from app import user_api_client
def test_form_is_valid_returns_no_errors(app_, mock_check_verify_code):
with app_.test_request_context(method='POST',
data={'sms_code': '12345'}) as req:
def _check_code(code):
return users_dao.check_verify_code('1', code, "sms")
return user_api_client.check_verify_code('1', code, "sms")
form = TwoFactorForm(_check_code)
assert form.validate() is True
assert len(form.errors) == 0
@@ -19,7 +18,7 @@ def test_returns_errors_when_code_is_too_short(app_, mock_check_verify_code):
with app_.test_request_context(method='POST',
data={'sms_code': '145'}) as req:
def _check_code(code):
return users_dao.check_verify_code('1', code, "sms")
return user_api_client.check_verify_code('1', code, "sms")
form = TwoFactorForm(_check_code)
assert form.validate() is False
assert len(form.errors) == 1
@@ -30,7 +29,7 @@ def test_returns_errors_when_code_is_missing(app_, mock_check_verify_code):
with app_.test_request_context(method='POST',
data={}) as req:
def _check_code(code):
return users_dao.check_verify_code('1', code, "sms")
return user_api_client.check_verify_code('1', code, "sms")
form = TwoFactorForm(_check_code)
assert form.validate() is False
assert len(form.errors) == 1
@@ -41,7 +40,7 @@ def test_returns_errors_when_code_contains_letters(app_, mock_check_verify_code)
with app_.test_request_context(method='POST',
data={'sms_code': 'asdfg'}) as req:
def _check_code(code):
return users_dao.check_verify_code('1', code, "sms")
return user_api_client.check_verify_code('1', code, "sms")
form = TwoFactorForm(_check_code)
assert form.validate() is False
assert len(form.errors) == 1
@@ -53,7 +52,7 @@ def test_should_return_errors_when_code_is_expired(app_,
with app_.test_request_context(method='POST',
data={'sms_code': '23456'}) as req:
def _check_code(code):
return users_dao.check_verify_code('1', code, "sms")
return user_api_client.check_verify_code('1', code, "sms")
form = TwoFactorForm(_check_code)
assert form.validate() is False
errors = form.errors

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

@@ -1,4 +1,3 @@
from app.main.dao import users_dao
from app.main.forms import RegisterUserForm

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

@@ -1,5 +1,4 @@
from flask import url_for
from app.main.dao import services_dao
def test_get_should_render_add_service_template(app_,

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

@@ -59,7 +59,7 @@ def test_should_redirect_if_not_logged_in(app_):
with app_.test_client() as client:
response = client.get(url_for('main.show_all_services_or_dashboard'))
assert response.status_code == 302
assert response.location == url_for('main.index', _external=True)
assert url_for('main.sign_in', _external=True) in response.location
def test_should_show_all_services_for_platform_admin_user(app_,

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

@@ -314,6 +314,6 @@ def test_remove_user_from_service(app_,
def _login_user(user, client, mocker, service):
mocker.patch('app.user_api_client.get_user', return_value=user)
mocker.patch('app.service_api_client.get_service', return_value=service)
mocker.patch('app.service_api_client.get_service', return_value={'data': service})
mocker.patch('app.service_api_client.get_services', return_value={'data': [service]})
client.login(user)