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

Merging conflict with two_factor.py

Browse Source 
Fixed merge mistake with two_factor.py.
This commit is contained in:
Nicholas Staples
2016-03-30 09:58:10 +01:00
parent 62ca57a5de
commit 48daac7b94
11 changed files with 44 additions and 123 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