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

Merge with master and test fix.

Browse Source
This commit is contained in:
Nicholas Staples
2016-01-06 17:17:02 +00:00
parent 0a4ea6ca2e
commit 10c2978f85
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/__init__.py
View File

@@ -33,7 +33,7 @@ def create_app(config_name):
init_csrf(application) init_csrf(application)
login_manager.init_app(application) login_manager.init_app(application)
login_manager.login_view = 'main.render_sign_in' login_manager.login_view = 'main.sign_in'
from app.main import main as main_blueprint from app.main import main as main_blueprint
application.register_blueprint(main_blueprint) application.register_blueprint(main_blueprint)

4
app/main/views/sign_out.py
View File

@@ -1,6 +1,6 @@
from flask import (render_template, redirect, url_for) from flask import (render_template, redirect, url_for)
from flask import session from flask import session
from flask_login import login_required, logout_user from flask_login import (login_required, logout_user)
from app.main import main from app.main import main
@@ -9,4 +9,4 @@ from app.main import main
@login_required @login_required
def sign_out(): def sign_out():
logout_user() logout_user()
return redirect(url_for('main.render_sign_in')) return redirect(url_for('main.sign_in'))

4
tests/app/main/views/test_sign_out.py
View File

@@ -12,7 +12,7 @@ def test_render_sign_out_redirects_to_sign_in(notifications_admin):
url_for('main.sign_out')) url_for('main.sign_out'))
assert response.status_code == 302 assert response.status_code == 302
assert response.location == url_for( assert response.location == url_for(
'main.render_sign_in', _external=True, next=url_for('main.sign_out')) 'main.sign_in', _external=True, next=url_for('main.sign_out'))
def test_sign_out_user(notifications_admin, def test_sign_out_user(notifications_admin,
@@ -40,4 +40,4 @@ def test_sign_out_user(notifications_admin,
response = client.get(url_for('main.sign_out')) response = client.get(url_for('main.sign_out'))
assert response.status_code == 302 assert response.status_code == 302
assert response.location == url_for( assert response.location == url_for(
'main.render_sign_in', _external=True) 'main.sign_in', _external=True)

2
tests/conftest.py
View File

@@ -21,7 +21,7 @@ class TestClient(FlaskClient):
session['user_id'] = user.id session['user_id'] = user.id
verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms') verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms')
response = self.post( response = self.post(
url_for('main.process_two_factor'), data={'sms_code': '12345'}) url_for('main.two_factor'), data={'sms_code': '12345'})
def logout(self, user): def logout(self, user):
self.get(url_for("main.logout")) self.get(url_for("main.logout"))