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

Merge branch 'master' into api-keys-flow

Browse Source 
Conflicts:
	tests/app/main/views/test_api_keys.py
This commit is contained in:
Rebecca Law
2016-01-21 15:50:00 +00:00
parent a66dd52ca8 fe6b406de4
commit 46e0e3fd1b
20 changed files with 376 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/app/main/views/test_api_keys.py
View File

@@ -2,15 +2,15 @@ from datetime import date
from flask import url_for
def test_should_show_documentation_page(app_,
db_,
db_session,
active_user,
mock_get_service,
mock_get_services,
mock_user_loader):
def test_should_show_api_keys_and_documentation_page(app_,
db_,
db_session,
mock_api_user,
mock_user_loader,
mock_user_dao_get_by_email):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
client.login(active_user)
response = client.get(url_for('main.documentation', service_id=123))