Resolving conflicts with both branches

Author: david-rocca

test/unit-tests/user/userCreateTest.js

@@ -45,8 +45,8 @@ const fakeLegacySavedObject = {
   }
 }
 const stubUser = {
-  username: 'stubUser',
-  org_UUID: stubOrgUUID
+  username: 'stubUser'
+  // org_UUID: stubOrgUUID
 }
 
 const fakeUserMongooseDocument = new BaseUser(fakeBaseUserSavedObject)
@@ -104,6 +104,7 @@ describe('Testing the POST /org/:shortname/user endpoint in Org Controller', ()
     it('User is created', async () => {
       sinon.stub(baseUserRepo, 'orgHasUser').resolves(false)
       sinon.stub(baseUserRepo, 'isAdminOrSecretariat').resolves(true)
+      sinon.stub(baseOrgRepo, 'getOrgUUID').resolves(true)
       sinon.stub(argon2, 'hash').resolves('hashedPassword')
       sinon.stub(BaseOrgRepository.prototype, 'findOneByShortName').resolves(fakeOrgMongooseDocument)
       sinon.stub(baseUserRepo, 'findUsersByOrgShortname').resolves([fakeUserMongooseDocument])
@@ -120,6 +121,7 @@ describe('Testing the POST /org/:shortname/user endpoint in Org Controller', ()
     it('User Fails to be created because not in the same org', async () => {
       sinon.stub(baseUserRepo, 'orgHasUser').resolves(false)
       sinon.stub(baseUserRepo, 'isAdminOrSecretariat').resolves(false)
+      sinon.stub(baseOrgRepo, 'getOrgUUID').resolves(true)
       req.ctx.org = 'FakeShortName'
       await USER_CREATE_SINGLE(req, res, next)
       expect(status.args[0][0]).to.equal(403)