From 7dc759482c9161c334c5b6589e16ac98083213f8 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Thu, 21 Sep 2017 11:43:16 +0100 Subject: [PATCH] Fix how adding user to project works in acceptance tests --- .../acceptance/coffee/AuthorizationTests.coffee | 6 +++--- .../web/test/acceptance/coffee/helpers/User.coffee | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/services/web/test/acceptance/coffee/AuthorizationTests.coffee b/services/web/test/acceptance/coffee/AuthorizationTests.coffee index 05c1615a3e..7b4824a3da 100644 --- a/services/web/test/acceptance/coffee/AuthorizationTests.coffee +++ b/services/web/test/acceptance/coffee/AuthorizationTests.coffee @@ -213,9 +213,9 @@ describe "Authorization", -> @owner.createProject "private-project", (error, project_id) => return done(error) if error? @project_id = project_id - @owner.addUserToProject @project_id, @ro_user.email, "readOnly", (error) => + @owner.addUserToProject @project_id, @ro_user, "readOnly", (error) => return done(error) if error? - @owner.addUserToProject @project_id, @rw_user.email, "readAndWrite", (error) => + @owner.addUserToProject @project_id, @rw_user, "readAndWrite", (error) => return done(error) if error? done() @@ -303,4 +303,4 @@ describe "Authorization", -> expect_no_settings_write_access @anon, @project_id, redirect_to: "/restricted", done it "should not allow an anonymous user admin access to it", (done) -> - expect_no_admin_access @anon, @project_id, redirect_to: "/restricted", done \ No newline at end of file + expect_no_admin_access @anon, @project_id, redirect_to: "/restricted", done diff --git a/services/web/test/acceptance/coffee/helpers/User.coffee b/services/web/test/acceptance/coffee/helpers/User.coffee index 761363fe94..21378aa844 100644 --- a/services/web/test/acceptance/coffee/helpers/User.coffee +++ b/services/web/test/acceptance/coffee/helpers/User.coffee @@ -121,13 +121,13 @@ class User return callback(err) callback(null) - addUserToProject: (project_id, email, privileges, callback = (error, user) ->) -> - @request.post { - url: "/project/#{project_id}/users", - json: {email, privileges} - }, (error, response, body) -> - return callback(error) if error? - callback(null, body.user) + addUserToProject: (project_id, user, privileges, callback = (error, user) ->) -> + if privileges == 'readAndWrite' + updateOp = {$addToSet: {collaberator_refs: user._id.toString()}} + else if privileges == 'readOnly' + updateOp = {$addToSet: {readOnly_refs: user._id.toString()}} + db.projects.update {_id: db.ObjectId(project_id)}, updateOp, (err) -> + callback(err) makePublic: (project_id, level, callback = (error) ->) -> @request.post {