From 696f19ee5423c8a01b8d20da467276bcabaf75c4 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 11 2019 11:22:01 +0000 Subject: Fix the tests We now return the created API token instead of the message to show to the users. So inform the users about the success of the operation in the controller directly. This fixes the tests as the Token object was not json serializable while the info string is. Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/ui/app.py b/pagure/ui/app.py index 4b2818c..aa5a5e1 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -1489,7 +1489,7 @@ def add_api_user_token(): if form.validate_on_submit(): try: - msg = pagure.lib.query.add_token_to_user( + pagure.lib.query.add_token_to_user( flask.g.session, project=None, description=form.description.data.strip() or None, @@ -1497,7 +1497,7 @@ def add_api_user_token(): username=user.username, ) flask.g.session.commit() - flask.flash(msg) + flask.flash("Token created") return flask.redirect( flask.url_for("ui_ns.user_settings") + "#nav-api-tab" ) diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 3b4736b..deeb315 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -2255,7 +2255,7 @@ def add_token(repo, username=None, namespace=None): if form.validate_on_submit(): try: - msg = pagure.lib.query.add_token_to_user( + pagure.lib.query.add_token_to_user( flask.g.session, repo, description=form.description.data.strip() or None, @@ -2263,7 +2263,7 @@ def add_token(repo, username=None, namespace=None): username=flask.g.fas_user.username, ) flask.g.session.commit() - flask.flash(msg) + flask.flash("Token created") return flask.redirect( flask.url_for( "ui_ns.view_settings", @@ -2324,7 +2324,7 @@ def renew_api_token(repo, token_id, username=None, namespace=None): if form.validate_on_submit(): acls = [acl.name for acl in token.acls] try: - msg = pagure.lib.query.add_token_to_user( + pagure.lib.query.add_token_to_user( flask.g.session, repo, description=token.description or None, @@ -2332,7 +2332,7 @@ def renew_api_token(repo, token_id, username=None, namespace=None): username=flask.g.fas_user.username, ) flask.g.session.commit() - flask.flash(msg) + flask.flash("Token created") return flask.redirect( flask.url_for( "ui_ns.view_settings",