darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05: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

19
tests/__init__.py
View File

@@ -62,13 +62,6 @@ def invite_json(id, from_user, service_id, email_address, permissions, created_a
TEST_USER_EMAIL = 'test@user.gov.uk'
def create_test_user(state):
from app.main.dao import users_dao
user = None
users_dao.insert_user(user)
return user
def create_test_api_user(state, permissions={}):
from app.notify_client.user_api_client import User
user_data = {'id': 1,
@@ -83,18 +76,6 @@ def create_test_api_user(state, permissions={}):
return user
def create_another_test_user(state):
from app.main.dao import users_dao
user = None
users_dao.insert_user(user)
return user
def get_test_user():
from app.main.dao import users_dao
return users_dao.get_user_by_email(TEST_USER_EMAIL)
def job_json():
import uuid
import datetime