From 563247044bc453c5c70da4b4e765374bac38174e Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 29 Jul 2016 09:52:55 +0100 Subject: [PATCH] Start testing the invite page --- .../CollaboratorsInviteController.coffee | 2 +- .../coffee/ProjectInviteTests.coffee | 22 ++++++++++++------- .../acceptance/coffee/helpers/User.coffee | 2 ++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee index 26da21d9db..c30acdb4cb 100644 --- a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee +++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee @@ -88,7 +88,7 @@ module.exports = CollaboratorsInviteController = logger.log {projectId}, "no project owner found" return _renderInvalidPage() # finally render the invite - res.render "project/invite/show", {invite, project, owner} + res.render "project/invite/show", {invite, project, owner, title: "Project Invite"} acceptInvite: (req, res, next) -> projectId = req.params.Project_id diff --git a/services/web/test/acceptance/coffee/ProjectInviteTests.coffee b/services/web/test/acceptance/coffee/ProjectInviteTests.coffee index aa29db344d..2e21d92a0b 100644 --- a/services/web/test/acceptance/coffee/ProjectInviteTests.coffee +++ b/services/web/test/acceptance/coffee/ProjectInviteTests.coffee @@ -6,10 +6,10 @@ settings = require "settings-sharelatex" CollaboratorsEmailHandler = require "../../../app/js/Features/Collaborators/CollaboratorsEmailHandler" -_createInvite = (projectId, user, email, callback=(err, invite)->) -> - user.getCsrfToken (err) -> +_createInvite = (projectId, sendingUser, email, callback=(err, invite)->) -> + sendingUser.getCsrfToken (err) -> return callback(err) if err - user.request.post { + sendingUser.request.post { url: "/project/#{projectId}/invite", json: email: email @@ -23,7 +23,7 @@ describe "ProjectInviteTests", -> @sendingUser = new User() @user = new User() @site_admin = new User({email: "admin@example.com"}) - @email = 'user@example.com' + @email = 'smoketestuser@example.com' @projectName = 'sharing test' @projectId = null @fakeProject = null @@ -55,7 +55,7 @@ describe "ProjectInviteTests", -> throw err done() - describe 'user is already a member of the project', -> + describe 'user is not a member of the project', -> beforeEach (done) -> @invite = null @@ -65,12 +65,18 @@ describe "ProjectInviteTests", -> @link = CollaboratorsEmailHandler._buildInviteUrl(@fakeProject, @invite) done() - it 'should redirect to the project page', (done) -> + it 'should render the invite page', (done) -> Async.series( [ (cb) => - console.log ">> yes" - cb() + @user.request.get { + uri: @link + baseUrl: null + }, (err, response, body) => + expect(err).to.be.oneOf [null, undefined] + expect(response.statusCode).to.equal 200 + expect(body).to.match new RegExp("Project Invite - .*") + cb() ], (err, result) => if err diff --git a/services/web/test/acceptance/coffee/helpers/User.coffee b/services/web/test/acceptance/coffee/helpers/User.coffee index 6ce3072529..a96ab42648 100644 --- a/services/web/test/acceptance/coffee/helpers/User.coffee +++ b/services/web/test/acceptance/coffee/helpers/User.coffee @@ -28,6 +28,8 @@ class User return callback(error) if error? @id = user?._id?.toString() @_id = user?._id?.toString() + @first_name = user?.first_name + @referal_id = user?.referal_id callback() logout: (callback = (error) ->) ->