Parcourir la source

Start testing the invite page

Shane Kilkelly il y a 10 ans
Parent
commit
563247044b

+ 1 - 1
services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee

@@ -88,7 +88,7 @@ module.exports = CollaboratorsInviteController =
 						logger.log {projectId}, "no project owner found"
 						logger.log {projectId}, "no project owner found"
 						return _renderInvalidPage()
 						return _renderInvalidPage()
 					# finally render the invite
 					# 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) ->
 	acceptInvite: (req, res, next) ->
 		projectId = req.params.Project_id
 		projectId = req.params.Project_id

+ 14 - 8
services/web/test/acceptance/coffee/ProjectInviteTests.coffee

@@ -6,10 +6,10 @@ settings = require "settings-sharelatex"
 CollaboratorsEmailHandler = require "../../../app/js/Features/Collaborators/CollaboratorsEmailHandler"
 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
 		return callback(err) if err
-		user.request.post {
+		sendingUser.request.post {
 			url: "/project/#{projectId}/invite",
 			url: "/project/#{projectId}/invite",
 			json:
 			json:
 				email: email
 				email: email
@@ -23,7 +23,7 @@ describe "ProjectInviteTests", ->
 		@sendingUser = new User()
 		@sendingUser = new User()
 		@user = new User()
 		@user = new User()
 		@site_admin = new User({email: "admin@example.com"})
 		@site_admin = new User({email: "admin@example.com"})
-		@email = 'user@example.com'
+		@email = 'smoketestuser@example.com'
 		@projectName = 'sharing test'
 		@projectName = 'sharing test'
 		@projectId = null
 		@projectId = null
 		@fakeProject = null
 		@fakeProject = null
@@ -55,7 +55,7 @@ describe "ProjectInviteTests", ->
 					throw err
 					throw err
 				done()
 				done()
 
 
-		describe 'user is already a member of the project', ->
+		describe 'user is not a member of the project', ->
 
 
 			beforeEach (done) ->
 			beforeEach (done) ->
 				@invite = null
 				@invite = null
@@ -65,12 +65,18 @@ describe "ProjectInviteTests", ->
 					@link = CollaboratorsEmailHandler._buildInviteUrl(@fakeProject, @invite)
 					@link = CollaboratorsEmailHandler._buildInviteUrl(@fakeProject, @invite)
 					done()
 					done()
 
 
-			it 'should redirect to the project page', (done) ->
+			it 'should render the invite page', (done) ->
 				Async.series(
 				Async.series(
 					[
 					[
 						(cb) =>
 						(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("<title>Project Invite - .*</title>")
+								cb()
 
 
 					], (err, result) =>
 					], (err, result) =>
 						if err
 						if err

+ 2 - 0
services/web/test/acceptance/coffee/helpers/User.coffee

@@ -28,6 +28,8 @@ class User
 					return callback(error) if error?
 					return callback(error) if error?
 					@id = user?._id?.toString()
 					@id = user?._id?.toString()
 					@_id = user?._id?.toString()
 					@_id = user?._id?.toString()
+					@first_name = user?.first_name
+					@referal_id = user?.referal_id
 					callback()
 					callback()
 
 
 	logout: (callback = (error) ->) ->
 	logout: (callback = (error) ->) ->