alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use multiple emails when relevant

Browse Source
This commit is contained in:
Tim Alby
2018-06-06 11:45:01 +02:00
parent c5530163f5
commit 813289f5de
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/test/unit/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee
+6 -6
View File
@@ -25,7 +25,7 @@ describe "CollaboratorsInviteController", ->
@LimitationsManager = {}
@UserGetter =
getUserByMainEmail: sinon.stub()
getUserByAnyEmail: sinon.stub()
getUser: sinon.stub()
@CollaboratorsInviteController = SandboxedModule.require modulePath, requires:
@@ -716,7 +716,7 @@ describe "CollaboratorsInviteController", ->
beforeEach ->
@user = {_id: ObjectId().toString()}
@UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, null, @user)
@UserGetter.getUserByAnyEmail = sinon.stub().callsArgWith(2, null, @user)
it 'should callback with `true`', (done) ->
@call (err, shouldAllow) =>
@@ -728,7 +728,7 @@ describe "CollaboratorsInviteController", ->
beforeEach ->
@user = null
@UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, null, @user)
@UserGetter.getUserByAnyEmail = sinon.stub().callsArgWith(2, null, @user)
it 'should callback with `false`', (done) ->
@call (err, shouldAllow) =>
@@ -738,15 +738,15 @@ describe "CollaboratorsInviteController", ->
it 'should have called getUser', (done) ->
@call (err, shouldAllow) =>
@UserGetter.getUserByMainEmail.callCount.should.equal 1
@UserGetter.getUserByMainEmail.calledWith(@email, {_id: 1}).should.equal true
@UserGetter.getUserByAnyEmail.callCount.should.equal 1
@UserGetter.getUserByAnyEmail.calledWith(@email, {_id: 1}).should.equal true
done()
describe 'when getUser produces an error', ->
beforeEach ->
@user = null
@UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, new Error('woops'))
@UserGetter.getUserByAnyEmail = sinon.stub().callsArgWith(2, new Error('woops'))
it 'should callback with an error', (done) ->
@call (err, shouldAllow) =>
services/web/test/unit/coffee/Collaborators/CollaboratorsInviteHandlerTests.coffee
+9 -9
View File
@@ -605,7 +605,7 @@ describe "CollaboratorsInviteHandler", ->
_id: ObjectId()
first_name: "jim"
@existingUser = {_id: ObjectId()}
@UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, null, @existingUser)
@UserGetter.getUserByAnyEmail = sinon.stub().callsArgWith(2, null, @existingUser)
@fakeProject =
_id: @project_id
name: "some project"
@@ -626,8 +626,8 @@ describe "CollaboratorsInviteHandler", ->
it 'should call getUser', (done) ->
@call (err) =>
@UserGetter.getUserByMainEmail.callCount.should.equal 1
@UserGetter.getUserByMainEmail.calledWith(@invite.email).should.equal true
@UserGetter.getUserByAnyEmail.callCount.should.equal 1
@UserGetter.getUserByAnyEmail.calledWith(@invite.email).should.equal true
done()
it 'should call getProject', (done) ->
@@ -671,7 +671,7 @@ describe "CollaboratorsInviteHandler", ->
describe 'when the user does not exist', ->
beforeEach ->
@UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, null, null)
@UserGetter.getUserByAnyEmail = sinon.stub().callsArgWith(2, null, null)
it 'should not produce an error', (done) ->
@call (err) =>
@@ -680,8 +680,8 @@ describe "CollaboratorsInviteHandler", ->
it 'should call getUser', (done) ->
@call (err) =>
@UserGetter.getUserByMainEmail.callCount.should.equal 1
@UserGetter.getUserByMainEmail.calledWith(@invite.email).should.equal true
@UserGetter.getUserByAnyEmail.callCount.should.equal 1
@UserGetter.getUserByAnyEmail.calledWith(@invite.email).should.equal true
done()
it 'should not call getProject', (done) ->
@@ -698,7 +698,7 @@ describe "CollaboratorsInviteHandler", ->
describe 'when the getUser produces an error', ->
beforeEach ->
@UserGetter.getUserByMainEmail = sinon.stub().callsArgWith(2, new Error('woops'))
@UserGetter.getUserByAnyEmail = sinon.stub().callsArgWith(2, new Error('woops'))
it 'should produce an error', (done) ->
@call (err) =>
@@ -707,8 +707,8 @@ describe "CollaboratorsInviteHandler", ->
it 'should call getUser', (done) ->
@call (err) =>
@UserGetter.getUserByMainEmail.callCount.should.equal 1
@UserGetter.getUserByMainEmail.calledWith(@invite.email).should.equal true
@UserGetter.getUserByAnyEmail.callCount.should.equal 1
@UserGetter.getUserByAnyEmail.calledWith(@invite.email).should.equal true
done()
it 'should not call getProject', (done) ->
services/web/test/unit/coffee/Subscription/SubscriptionGroupHandlerTests.coffee
+4 -4
View File
@@ -32,7 +32,7 @@ describe "SubscriptionGroupHandler", ->
@UserGetter =
getUser: sinon.stub()
getUserByMainEmail: sinon.stub()
getUserByAnyEmail: sinon.stub()
@LimitationsManager =
hasGroupMembersLimitReached: sinon.stub()
@@ -71,11 +71,11 @@ describe "SubscriptionGroupHandler", ->
describe "addUserToGroup", ->
beforeEach ->
@LimitationsManager.hasGroupMembersLimitReached.callsArgWith(1, null, false, @subscription)
@UserGetter.getUserByMainEmail.callsArgWith(1, null, @user)
@UserGetter.getUserByAnyEmail.callsArgWith(1, null, @user)
it "should find the user", (done)->
@Handler.addUserToGroup @adminUser_id, @newEmail, (err)=>
@UserGetter.getUserByMainEmail.calledWith(@newEmail).should.equal true
@UserGetter.getUserByAnyEmail.calledWith(@newEmail).should.equal true
done()
it "should add the user to the group", (done)->
@@ -102,7 +102,7 @@ describe "SubscriptionGroupHandler", ->
done()
it "should add an email invite if no user is found", (done) ->
@UserGetter.getUserByMainEmail.callsArgWith(1, null, null)
@UserGetter.getUserByAnyEmail.callsArgWith(1, null, null)
@Handler.addUserToGroup @adminUser_id, @newEmail, (err)=>
@SubscriptionUpdater.addEmailInviteToGroup.calledWith(@adminUser_id, @newEmail).should.equal true
done()