Merge with master and test fix.

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)

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'))

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)

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"))