From 78570817d59eb3791f033e93b530c9362958f2d0 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 22 Jul 2016 16:28:00 +0100 Subject: [PATCH] Render a separate template if the invite is not found. --- .../CollaboratorsInviteController.coffee | 4 ++-- services/web/app/views/project/invite/not-valid.jade | 1 + .../views/project/{invite.jade => invite/show.jade} | 0 .../CollaboratorsInviteControllerTests.coffee | 11 ++++------- 4 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 services/web/app/views/project/invite/not-valid.jade rename services/web/app/views/project/{invite.jade => invite/show.jade} (100%) diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee index 1c8e3adec7..c3c73a2165 100644 --- a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee +++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee @@ -50,8 +50,8 @@ module.exports = CollaboratorsInviteController = # TODO: render a not-valid view instead if !invite logger.log {projectId, token}, "no invite found for token" - return res.sendStatus(404) - res.render "project/invite", {invite} + return res.render "project/invite/not-valid" + res.render "project/invite/show", {invite} acceptInvite: (req, res, next) -> projectId = req.params.Project_id diff --git a/services/web/app/views/project/invite/not-valid.jade b/services/web/app/views/project/invite/not-valid.jade new file mode 100644 index 0000000000..6eb6306b16 --- /dev/null +++ b/services/web/app/views/project/invite/not-valid.jade @@ -0,0 +1 @@ +h1 Invite Not Valid TEST \ No newline at end of file diff --git a/services/web/app/views/project/invite.jade b/services/web/app/views/project/invite/show.jade similarity index 100% rename from services/web/app/views/project/invite.jade rename to services/web/app/views/project/invite/show.jade diff --git a/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee b/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee index 38d07269df..6e1cb4f11a 100644 --- a/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee @@ -145,7 +145,7 @@ describe "CollaboratorsInviteController", -> it 'should render the view template', -> @res.render.callCount.should.equal 1 - @res.render.calledWith('project/invite').should.equal true + @res.render.calledWith('project/invite/show').should.equal true it 'should not call next', -> @next.callCount.should.equal 0 @@ -173,12 +173,9 @@ describe "CollaboratorsInviteController", -> @CollaboratorsInviteHandler.getInviteByToken.callsArgWith(2, null, null) @CollaboratorsInviteController.viewInvite @req, @res, @next - it 'should produce a 404 response', -> - @res.sendStatus.callCount.should.equal 1 - @res.sendStatus.calledWith(404).should.equal true - - it 'should not render the view template', -> - @res.render.callCount.should.equal 0 + it 'should render the not-valid view template', -> + @res.render.callCount.should.equal 1 + @res.render.calledWith('project/invite/not-valid').should.equal true it 'should not call next', -> @next.callCount.should.equal 0