Merge pull request #658 from eisbilir/feature/new-milestone-concept

fix: phase member test spec

Author: elkhawajah

src/events/projects/index.spec.js

@@ -25,7 +25,7 @@ describe('projectUpdatedKafkaHandler', () => {
     initiatorUserId: 2,
   };
 
-  const mockedApp = {};
+  const mockedApp = { logger: console, models };
 
   it('should throw validation exception when payload is empty', async () => {
     await expect(projectUpdatedKafkaHandler(mockedApp, topic, {})).to.be.rejectedWith(Error);

src/routes/phaseMembers/delete.spec.js

@@ -88,6 +88,8 @@ describe('Delete phase member', () => {
               models.ProjectPhaseMember.create({
                 phaseId,
                 userId: copilotUser.userId,
+                createdBy: 1,
+                updatedBy: 1,
               }).then((phaseMember) => {
                 _.assign(phase, { members: [phaseMember.toJSON()] });
                 // Index to ES
@@ -112,7 +114,7 @@ describe('Delete phase member', () => {
   after((done) => {
     testUtil.clearDb(done);
   });
-  describe('DELETE /projects/{projectId}/phases/{phaseId}/members/{memberId}', () => {
+  describe('DELETE /projects/{projectId}/phases/{phaseId}/members/{userId}', () => {
     it('should return 403 for anonymous user', (done) => {
       request(server)
         .delete(`/v5/projects/${id}/phases/${phaseId}/members/${copilotUser.userId}`)

src/routes/phaseMembers/list.spec.js

@@ -20,7 +20,6 @@ describe('List phase members', () => {
   let id;
   let project;
   let phaseId;
-  let memberId;
   const copilotUser = {
     handle: testUtil.getDecodedToken(testUtil.jwts.copilot).handle,
     userId: testUtil.getDecodedToken(testUtil.jwts.copilot).userId,
@@ -57,8 +56,7 @@ describe('List phase members', () => {
             isPrimary: false,
             createdBy: 1,
             updatedBy: 1,
-          }).then((member) => {
-            memberId = member.id;
+          }).then(() => {
             models.ProjectPhase.create({
               name: 'test project phase',
               projectId: id,
@@ -77,8 +75,9 @@ describe('List phase members', () => {
               phaseId = phase.id;
               models.ProjectPhaseMember.create({
                 phaseId,
-                memberId,
                 userId: copilotUser.userId,
+                createdBy: 1,
+                updatedBy: 1,
               }).then((phaseMember) => {
                 _.assign(phase, { members: [phaseMember.toJSON()] });
                 // Index to ES
@@ -151,7 +150,6 @@ describe('List phase members', () => {
           should.exist(resJson);
           resJson.should.have.length(1);
           resJson[0].userId.should.be.eql(copilotUser.userId);
-          resJson[0].memberId.should.be.eql(1);
           resJson[0].phaseId.should.be.eql(phaseId);
           done();
         });

src/routes/phaseMembers/update.spec.js

@@ -91,6 +91,8 @@ describe('Update phase members', () => {
               models.ProjectPhaseMember.create({
                 phaseId,
                 userId: copilotUser.userId,
+                createdBy: 1,
+                updatedBy: 1,
               }).then((phaseMember) => {
                 _.assign(phase, { members: [phaseMember.toJSON()] });
                 // Index to ES
@@ -119,7 +121,7 @@ describe('Update phase members', () => {
     it('should return 403 for anonymous user', (done) => {
       request(server)
         .post(`/v5/projects/${id}/phases/${phaseId}/members`)
-        .send({ memberIds: [copilotUser.userId, memberUser.userId] })
+        .send({ userIds: [copilotUser.userId, memberUser.userId] })
         .expect(403, done);
     });
 
@@ -129,7 +131,7 @@ describe('Update phase members', () => {
         .set({
           Authorization: `Bearer ${testUtil.jwts.member}`,
         })
-        .send({ memberIds: [copilotUser.userId, memberUser.userId] })
+        .send({ userIds: [copilotUser.userId, memberUser.userId] })
         .expect(403, done);
     });
 
@@ -139,7 +141,7 @@ describe('Update phase members', () => {
         .set({
           Authorization: `Bearer ${testUtil.jwts.connectAdmin}`,
         })
-        .send({ memberIds: [copilotUser.userId, memberUser.userId] })
+        .send({ userIds: [copilotUser.userId, memberUser.userId] })
         .expect(200)
         .end((err, res) => {
           const resJson = res.body;
@@ -155,7 +157,7 @@ describe('Update phase members', () => {
         .set({
           Authorization: `Bearer ${testUtil.jwts.admin}`,
         })
-        .send({ memberIds: [] })
+        .send({ userIds: [] })
         .expect(200)
         .end((err, res) => {
           const resJson = res.body;
@@ -171,7 +173,7 @@ describe('Update phase members', () => {
         .set({
           Authorization: `Bearer ${testUtil.jwts.copilot}`,
         })
-        .send({ memberIds: [copilotUser.userId, memberUser.userId] })
+        .send({ userIds: [copilotUser.userId, memberUser.userId] })
         .expect(403, done);
     });
   });

src/routes/phases/list.js

@@ -59,7 +59,7 @@ module.exports = [
         let phases = _.isArray(doc._source.phases) ? doc._source.phases : []; // eslint-disable-line no-underscore-dangle
 
         if (memberOnly && !isAdmin) {
-          phases = _.filter(phases, phase => _.includes(_.map(_.get(phase, 'members'), 'userId')), req.authUser.userId);
+          phases = _.filter(phases, phase => _.includes(_.map(_.get(phase, 'members'), 'userId'), req.authUser.userId));
         }
         // Sort
         phases = _.orderBy(phases, [sortColumnAndOrder[0]], [sortColumnAndOrder[1]]);
@@ -110,7 +110,7 @@ module.exports = [
               phases = _.map(phases, phase => phase.toJSON());
               if (memberOnly && !isAdmin) {
                 phases = _.filter(phases, phase =>
-                  _.includes(_.map(_.get(phase, 'members'), 'userId')), req.authUser.userId);
+                  _.includes(_.map(_.get(phase, 'members'), 'userId'), req.authUser.userId));
               }
               // Sort
               phases = _.orderBy(phases, [sortColumnAndOrder[0]], [sortColumnAndOrder[1]]);

src/routes/phases/list.spec.js

@@ -89,8 +89,9 @@ describe('Project Phases', () => {
             const phase = ph.toJSON();
             models.ProjectPhaseMember.create({
               phaseId: phase.id,
-              memberId: 1,
               userId: copilotUser.userId,
+              createdBy: 1,
+              updatedBy: 1,
             }).then((phaseMember) => {
               _.assign(phase, { members: [phaseMember.toJSON()] });
               // Index to ES