diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee index 2744a7786a..af5b586451 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee @@ -33,7 +33,7 @@ module.exports = SubscriptionGroupHandler = userViewModel = buildUserViewModel(user) callback(err, userViewModel) else - TeamInvitesHandler.createManagerInvite adminUserId, newEmail, (err) -> + TeamInvitesHandler.createInvite adminUserId, newEmail, (err) -> return callback(err) if err? userViewModel = buildEmailInviteViewModel(newEmail) callback(err, userViewModel) diff --git a/services/web/app/coffee/Features/Subscription/TeamInvitesController.coffee b/services/web/app/coffee/Features/Subscription/TeamInvitesController.coffee index ddc2a27888..f4f0933fdd 100644 --- a/services/web/app/coffee/Features/Subscription/TeamInvitesController.coffee +++ b/services/web/app/coffee/Features/Subscription/TeamInvitesController.coffee @@ -10,7 +10,7 @@ module.exports = teamManagerId = AuthenticationController.getLoggedInUserId(req) email = req.body.email - TeamInvitesHandler.createManagerInvite teamManagerId, email, (err, invite) -> + TeamInvitesHandler.createInvite teamManagerId, email, (err, invite) -> return handleError(err, req, res, next) if err? inviteView = { user: { email: invite.email, sentAt: invite.sentAt, invite: true } diff --git a/services/web/app/coffee/Features/Subscription/TeamInvitesHandler.coffee b/services/web/app/coffee/Features/Subscription/TeamInvitesHandler.coffee index 3164585f7a..69aff6cf81 100644 --- a/services/web/app/coffee/Features/Subscription/TeamInvitesHandler.coffee +++ b/services/web/app/coffee/Features/Subscription/TeamInvitesHandler.coffee @@ -24,7 +24,7 @@ module.exports = TeamInvitesHandler = invite = subscription.teamInvites.find (i) -> i.token == token return callback(null, invite, subscription) - createManagerInvite: (teamManagerId, email, callback) -> + createInvite: (teamManagerId, email, callback) -> logger.log {teamManagerId, email}, "Creating manager team invite" UserGetter.getUser teamManagerId, (error, teamManager) -> return callback(error) if error? @@ -73,7 +73,7 @@ module.exports = TeamInvitesHandler = return callback(err) if err? async.map teams, - (team, cb) -> TeamInvitesHandler.createManagerInvite(team.admin_id, email, cb) + (team, cb) -> TeamInvitesHandler.createInvite(team.admin_id, email, cb) , callback createInvite = (subscription, email, inviterName, callback) -> diff --git a/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee b/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee index 4a2e01fb05..8b35a36fe7 100644 --- a/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee +++ b/services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee @@ -29,7 +29,7 @@ describe "SubscriptionGroupHandler", -> removeUserFromGroup: sinon.stub().callsArgWith(2) @TeamInvitesHandler = - createManagerInvite: sinon.stub().callsArgWith(2) + createInvite: sinon.stub().callsArgWith(2) @UserGetter = getUser: sinon.stub() @@ -106,7 +106,7 @@ describe "SubscriptionGroupHandler", -> it "should add an email invite if no user is found", (done) -> @UserGetter.getUserByMainEmail.callsArgWith(1, null, null) @Handler.addUserToGroup @adminUser_id, @newEmail, (err)=> - @TeamInvitesHandler.createManagerInvite.calledWith(@adminUser_id, @newEmail).should.equal true + @TeamInvitesHandler.createInvite.calledWith(@adminUser_id, @newEmail).should.equal true done() describe "removeUserFromGroup", -> diff --git a/services/web/test/unit/coffee/Subscription/TeamInvitesHandlerTests.coffee b/services/web/test/unit/coffee/Subscription/TeamInvitesHandlerTests.coffee index eacab19d04..8a977a8706 100644 --- a/services/web/test/unit/coffee/Subscription/TeamInvitesHandlerTests.coffee +++ b/services/web/test/unit/coffee/Subscription/TeamInvitesHandlerTests.coffee @@ -98,9 +98,9 @@ describe "TeamInvitesHandler", -> expect(err).to.deep.eq(teamNotFound: true) done() - describe "createManagerInvite", -> + describe "createInvite", -> it "adds the team invite to the subscription", (done) -> - @TeamInvitesHandler.createManagerInvite @manager.id, "John.Snow@nightwatch.com", (err, invite) => + @TeamInvitesHandler.createInvite @manager.id, "John.Snow@nightwatch.com", (err, invite) => expect(err).to.eq(null) expect(invite.token).to.eq(@newToken) expect(invite.email).to.eq("john.snow@nightwatch.com") @@ -109,7 +109,7 @@ describe "TeamInvitesHandler", -> done() it "sends an email", (done) -> - @TeamInvitesHandler.createManagerInvite @manager.id, "John.Snow@nightwatch.com", (err, invite) => + @TeamInvitesHandler.createInvite @manager.id, "John.Snow@nightwatch.com", (err, invite) => @EmailHandler.sendEmail.calledWith("verifyEmailToJoinTeam", sinon.match({ to: "john.snow@nightwatch.com", @@ -122,7 +122,7 @@ describe "TeamInvitesHandler", -> it "refreshes the existing invite if the email has already been invited", (done) -> originalInvite = Object.assign({}, @teamInvite) - @TeamInvitesHandler.createManagerInvite @manager.id, originalInvite.email, (err, invite) => + @TeamInvitesHandler.createInvite @manager.id, originalInvite.email, (err, invite) => expect(err).to.eq(null) expect(invite).to.exist @@ -206,26 +206,26 @@ describe "TeamInvitesHandler", -> describe "createTeamInvitesForLegacyInvitedEmail", (done) -> beforeEach -> @subscription.invited_emails = ["eddard@stark.com", "robert@stark.com"] - @TeamInvitesHandler.createManagerInvite = sinon.stub().yields(null) + @TeamInvitesHandler.createInvite = sinon.stub().yields(null) @SubscriptionLocator.getGroupsWithEmailInvite = sinon.stub().yields(null, [@subscription]) it "sends an invitation email to addresses in the legacy invited_emails field", (done) -> @TeamInvitesHandler.createTeamInvitesForLegacyInvitedEmail "eddard@stark.com", (err, invite) => expect(err).not.to.exist - @TeamInvitesHandler.createManagerInvite.calledWith( + @TeamInvitesHandler.createInvite.calledWith( @subscription.admin_id, "eddard@stark.com" ).should.eq true - @TeamInvitesHandler.createManagerInvite.callCount.should.eq 1 + @TeamInvitesHandler.createInvite.callCount.should.eq 1 done() describe "validation", -> it "doesn't create an invite if the team limit has been reached", (done) -> @LimitationsManager.teamHasReachedMemberLimit = sinon.stub().returns(true) - @TeamInvitesHandler.createManagerInvite @manager.id, "John.Snow@nightwatch.com", (err, invite) => + @TeamInvitesHandler.createInvite @manager.id, "John.Snow@nightwatch.com", (err, invite) => expect(err).to.deep.equal(limitReached: true) done() @@ -239,7 +239,7 @@ describe "TeamInvitesHandler", -> @subscription.member_ids = [member.id] @UserGetter.getUserByAnyEmail.withArgs(member.email).yields(null, member) - @TeamInvitesHandler.createManagerInvite @manager.id, "tyrion@lannister.com", (err, invite) => + @TeamInvitesHandler.createInvite @manager.id, "tyrion@lannister.com", (err, invite) => expect(err).to.deep.equal(alreadyInTeam: true) expect(invite).not.to.exist done()