From 71be3b27f78d331cef84b939158be13238bc137a Mon Sep 17 00:00:00 2001 From: Son NK <> Date: Wed, 28 Oct 2020 10:49:50 +0100 Subject: [PATCH] redirect user to dashboard when setup is done --- .../templates/dashboard/setup_done.html | 24 ------------------- app/dashboard/views/setup_done.py | 4 ++-- tests/dashboard/test_setup_done.py | 16 +++++++++++++ 3 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 app/dashboard/templates/dashboard/setup_done.html create mode 100644 tests/dashboard/test_setup_done.py diff --git a/app/dashboard/templates/dashboard/setup_done.html b/app/dashboard/templates/dashboard/setup_done.html deleted file mode 100644 index 98b8b65d..00000000 --- a/app/dashboard/templates/dashboard/setup_done.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "base.html" %} - -{% block title %} - Setup is done -{% endblock %} - -{% block content %} -
-
-
-
-
- -
- -
-

Setup is done!

-

Now click on SimpleLogin button to create your alias!

-
-
-
-
-
-{% endblock %} diff --git a/app/dashboard/views/setup_done.py b/app/dashboard/views/setup_done.py index 80c9dcc5..07d3295f 100644 --- a/app/dashboard/views/setup_done.py +++ b/app/dashboard/views/setup_done.py @@ -1,5 +1,5 @@ import arrow -from flask import render_template, make_response +from flask import make_response, redirect, url_for from flask_login import login_required from app.config import URL @@ -9,7 +9,7 @@ from app.dashboard.base import dashboard_bp @dashboard_bp.route("/setup_done", methods=["GET", "POST"]) @login_required def setup_done(): - response = make_response(render_template("dashboard/setup_done.html")) + response = make_response(redirect(url_for("dashboard.index"))) response.set_cookie( "setup_done", diff --git a/tests/dashboard/test_setup_done.py b/tests/dashboard/test_setup_done.py new file mode 100644 index 00000000..45f88fc6 --- /dev/null +++ b/tests/dashboard/test_setup_done.py @@ -0,0 +1,16 @@ +from flask import url_for + +from tests.utils import login + + +def test_setup_done(flask_client): + login(flask_client) + + r = flask_client.get( + url_for("dashboard.setup_done"), + ) + + assert r.status_code == 302 + # user is redirected to the dashboard page + assert r.headers["Location"].endswith("/dashboard/") + assert "setup_done=true" in r.headers["Set-Cookie"]