From 10c2978f856d9927ddb32bd11757e3e889e70f9f Mon Sep 17 00:00:00 2001 From: Nicholas Staples Date: Wed, 6 Jan 2016 17:17:02 +0000 Subject: [PATCH] Merge with master and test fix. --- app/__init__.py | 2 +- app/main/views/sign_out.py | 4 ++-- tests/app/main/views/test_sign_out.py | 4 ++-- tests/conftest.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 498230fe3..1a25d59d9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -33,7 +33,7 @@ def create_app(config_name): init_csrf(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 application.register_blueprint(main_blueprint) diff --git a/app/main/views/sign_out.py b/app/main/views/sign_out.py index 0466d0af9..d734916c8 100644 --- a/app/main/views/sign_out.py +++ b/app/main/views/sign_out.py @@ -1,6 +1,6 @@ from flask import (render_template, redirect, url_for) 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 @@ -9,4 +9,4 @@ from app.main import main @login_required def sign_out(): logout_user() - return redirect(url_for('main.render_sign_in')) + return redirect(url_for('main.sign_in')) diff --git a/tests/app/main/views/test_sign_out.py b/tests/app/main/views/test_sign_out.py index 57925081a..05fc8804d 100644 --- a/tests/app/main/views/test_sign_out.py +++ b/tests/app/main/views/test_sign_out.py @@ -12,7 +12,7 @@ def test_render_sign_out_redirects_to_sign_in(notifications_admin): url_for('main.sign_out')) assert response.status_code == 302 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, @@ -40,4 +40,4 @@ def test_sign_out_user(notifications_admin, response = client.get(url_for('main.sign_out')) assert response.status_code == 302 assert response.location == url_for( - 'main.render_sign_in', _external=True) + 'main.sign_in', _external=True) diff --git a/tests/conftest.py b/tests/conftest.py index a98083297..ba1d68258 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -21,7 +21,7 @@ class TestClient(FlaskClient): session['user_id'] = user.id verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms') 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): self.get(url_for("main.logout"))