Merge conflicts and test fixes

This commit is contained in:
Adam Shimali
2016-01-20 15:40:06 +00:00
parent ca3d3240a6
commit fcedae5fe1
3 changed files with 11 additions and 6 deletions

View File

@@ -4,7 +4,8 @@ from flask import url_for
def test_should_show_api_keys_and_documentation_page(app_,
db_,
db_session,
active_user):
active_user,
mock_user_loader):
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user)