From 90dac348ffb21b4f674e289033b3b7bd814043a3 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Wed, 8 Jun 2016 11:04:44 +0100 Subject: [PATCH] refine beta opt-in workflow. --- .../coffee/Features/BetaProgram/BetaProgramController.coffee | 2 +- services/web/app/views/beta_program/opt_in.jade | 4 +++- .../coffee/BetaProgram/BetaProgramControllerTests.coffee | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/BetaProgram/BetaProgramController.coffee b/services/web/app/coffee/Features/BetaProgram/BetaProgramController.coffee index 4877d6e945..1fc7ee4d12 100644 --- a/services/web/app/coffee/Features/BetaProgram/BetaProgramController.coffee +++ b/services/web/app/coffee/Features/BetaProgram/BetaProgramController.coffee @@ -14,7 +14,7 @@ module.exports = BetaProgramController = BetaProgramHandler.optIn user_id, (err) -> if err return next(err) - return res.redirect "/" + return res.redirect "/beta/opt-in" optInPage: (req, res, next)-> user_id = req.session?.user?._id diff --git a/services/web/app/views/beta_program/opt_in.jade b/services/web/app/views/beta_program/opt_in.jade index fc8089c255..f48f4c241d 100644 --- a/services/web/app/views/beta_program/opt_in.jade +++ b/services/web/app/views/beta_program/opt_in.jade @@ -18,11 +18,13 @@ block content .col-md-12 if user.betaProgram p #{translate("beta_program_already_participating")} + .form-group + a(href="/project").btn.btn-info #{translate("back_to_your_projects")} else form(method="post", action="/beta/opt-in", novalidate) .form-group input(type="hidden", name="_csrf", value=csrfToken) - button.btn.btn-lg.btn-primary( + button.btn.btn-primary( type="submit" ) span #{translate("beta_program_opt_in_action")} diff --git a/services/web/test/UnitTests/coffee/BetaProgram/BetaProgramControllerTests.coffee b/services/web/test/UnitTests/coffee/BetaProgram/BetaProgramControllerTests.coffee index d764db4865..86a6ad3801 100644 --- a/services/web/test/UnitTests/coffee/BetaProgram/BetaProgramControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/BetaProgram/BetaProgramControllerTests.coffee @@ -44,9 +44,10 @@ describe "BetaProgramController", -> beforeEach -> @BetaProgramHandler.optIn.callsArgWith(1, null) - it "should redirect to '/'", () -> + it "should redirect to '/beta/opt-in'", () -> @BetaProgramController.optIn @req, @res, @next @res.redirect.callCount.should.equal 1 + @res.redirect.firstCall.args[0].should.equal "/beta/opt-in" it "should not call next with an error", () -> @BetaProgramController.optIn @req, @res, @next