removed rejection and unnecessary test cases as well

salesforce · Oct 24, 2016 · 6a3178d · 6a3178d
1 parent a402180
commit 6a3178d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 102 deletions.
diff --git a/db/helpers/common.js b/db/helpers/common.js
@@ -47,7 +47,8 @@ function augmentSampleWithSubjectInfo(seq, inst) {
       inst.dataValues.subject = sub;
 
       // adding absolutePath to sample instance
-      inst.dataValues.absolutePath = sub.absolutePath;
+      if (sub)
+        inst.dataValues.absolutePath = sub.absolutePath;
       inst.subject = sub;
       resolve(inst);
     })

diff --git a/tests/api/v1/subjects/patch.js b/tests/api/v1/subjects/patch.js
@@ -280,6 +280,7 @@ describe(`api: PATCH ${path}`, () => {
       done();
     });
   });
+
   it('cannot patch tags with names starting with a dash (-)', (done) => {
     const tags = ['-tag1'];
     p1.tags = tags;
@@ -299,6 +300,7 @@ describe(`api: PATCH ${path}`, () => {
       done();
     });
   });
+
   it('patch tags multiple', (done) => {
     const tags = [
       'tag0',
@@ -465,9 +467,11 @@ describe(`api: PATCH ${path}`, () => {
       if (err) {
         return done(err);
       }
+
       expect(res.body.errors[0].message).to
       .equal('You cannot unpublish this subject until ' +
         'all its descendants are unpublished.');
+
       done();
     });
   });

diff --git a/tests/api/v1/subjects/put.js b/tests/api/v1/subjects/put.js
@@ -231,78 +231,6 @@ describe(`api: PUT ${path}`, () => {
       done();
     });
   });
-
-  it('geolocation array must not contain null elements while patching',
-  (done) => {
-    const toPatch = {
-      isPublished: p1.isPublished,
-      name: p1.name,
-      geolocation: [null, null],
-    };
-    api.put(`${path}/${i0}`)
-    .set('Authorization', token)
-    .send(toPatch)
-    .expect(constants.httpStatus.BAD_REQUEST)
-    .end((err, res) => {
-      if (err) {
-        return done(err);
-      }
-
-      expect(res.body.errors[0].message).to
-      .equal('Expected type number but found type null');
-      expect(res.body.errors[0].source).to
-      .equal('geolocation');
-      done();
-    });
-  });
-
-  it('geolocation array cant contain less than two elements in patching',
-  (done) => {
-    const toPatch = {
-      isPublished: p1.isPublished,
-      name: p1.name,
-      geolocation: [1],
-    };
-    api.put(`${path}/${i0}`)
-    .set('Authorization', token)
-    .send(toPatch)
-    .expect(constants.httpStatus.BAD_REQUEST)
-    .end((err, res) => {
-      if (err) {
-        return done(err);
-      }
-
-      expect(res.body.errors[0].message).to
-      .equal('A non-null range must include two elements');
-      expect(res.body.errors[0].source).to
-      .equal('geolocation');
-      done();
-    });
-  });
-
-  it('geolocation array cant contain more than three elements in patching',
-  (done) => {
-    const toPatch = {
-      isPublished: p1.isPublished,
-      name: p1.name,
-      geolocation: [1,2,3],
-    };
-    api.put(`${path}/${i0}`)
-    .set('Authorization', token)
-    .send(toPatch)
-    .expect(constants.httpStatus.BAD_REQUEST)
-    .end((err, res) => {
-      if (err) {
-        return done(err);
-      }
-
-      expect(res.body.errors[0].message).to
-      .equal('A non-null range must include two elements');
-      expect(res.body.errors[0].source).to
-      .equal('geolocation');
-      done();
-    });
-  });
 });
 
 describe('api: PUT subjects with related links', () => {

diff --git a/tests/db/model/subject/update.js b/tests/db/model/subject/update.js
@@ -61,7 +61,7 @@ describe('db: subject: update: ', () => {
       Subject.create({ name: parentName })
       .then((parent) => {
         oldParentId = parent.id;
-        return Subject.findById(childId1);
+        return Subject.findById(childId2);
       })
       .then((child) => {
         return child.update({ parentAbsolutePath: parentName });
@@ -90,7 +90,7 @@ describe('db: subject: update: ', () => {
       Subject.create({ name: parentName })
       .then((parent) => {
         oldParentId = parent.id;
-        return Subject.findById(childId1);
+        return Subject.findById(childId2);
       })
       .then((child) => {
         return child.update({ parentAbsolutePath: parentName });
@@ -114,13 +114,18 @@ describe('db: subject: update: ', () => {
 
     it('on update child name, child should remain parented', (done) => {
       const childName = 'achoo';
-      Subject.findById(childId1)
+      let oldParentId = null;
+      let oldParentAbsolutePath = null;
+      Subject.findById(childId2)
       .then((child) => {
+        oldParentId = child.parentId;
+        oldParentAbsolutePath = child.parentAbsolutePath;
         return child.update({ name: childName });
       })
       .then((child) => {
-        expect(child.dataValues.parentAbsolutePath).to.not.be.null;
-        expect(child.dataValues.absolutePath).to.contain('.');
+        expect(child.dataValues.parentId).to.equal(oldParentId);
+        expect(child.dataValues.parentAbsolutePath)
+          .to.equal(oldParentAbsolutePath);
         done();
       })
       .catch((err) => {
@@ -179,14 +184,14 @@ describe('db: subject: update: ', () => {
       const parentName = `${tu.namePrefix}parent3`;
       Subject.create({ name: parentName })
       .then(() => {
-        return Subject.findById(childId1);
+        return Subject.findById(childId2);
       })
       .then((child) => {
         return child.update({ parentAbsolutePath: parentName });
       })
       .then((child) => {
         expect(child.dataValues.absolutePath).to
-        .equal(`${parentName}.${tu.namePrefix}child1`);
+        .equal(`${parentName}.${tu.namePrefix}child2`);
         expect(child.dataValues.parentAbsolutePath).to.equal(parentName);
         done();
       })
@@ -200,15 +205,15 @@ describe('db: subject: update: ', () => {
       const parentName = `${tu.namePrefix}parent2`;
       Subject.create({ name: parentName })
       .then(() => {
-        return Subject.findById(childId1);
+        return Subject.findById(childId2);
       })
       .then((subj) => {
         return subj.update({ parentAbsolutePath: parentName });
       })
       .then((subj) => {
         expect(subj.dataValues.parentAbsolutePath).to.equal(parentName);
         expect(subj.dataValues.absolutePath).to
-        .equal(`${tu.namePrefix}parent2.${tu.namePrefix}child1`);
+        .equal(`${tu.namePrefix}parent2.${tu.namePrefix}child2`);
         done();
       })
       .catch((err) => {
@@ -293,24 +298,6 @@ describe('db: subject: update: ', () => {
       .catch((err) => done(err));
     });
 
-    it('update parent isPublished to false, should not change child subject',
-    (done) => {
-      Subject.findById(subjId1)
-      .then((parent) => {
-        expect(parent.get('isPublished')).to.equal(true);
-        parent.update({ isPublished: false });
-        expect(parent.get('isPublished')).to.equal(false);
-      })
-      .then(() => {
-        return Subject.findById(childId1);
-      })
-      .then((child) => {
-        expect(child.get('isPublished')).to.equal(true);
-        done();
-      })
-      .catch((err) => done(err));
-    });
-
     it('update child helpEmail, should not change parent subject',
     (done) => {
       Subject.findById(childId1)
@@ -370,14 +357,14 @@ describe('db: subject: update: ', () => {
 
     it('update child isPublished, should not change parent subject',
     (done) => {
-      Subject.findById(childId1)
+      Subject.findById(childId2)
       .then((child) => {
         expect(child.get('isPublished')).to.equal(true);
         child.update({ isPublished: false });
         expect(child.get('isPublished')).to.equal(false);
       })
       .then(() => {
-        return Subject.findById(subjId1);
+        return Subject.findById(childId1);
       })
       .then((parent) => {
         expect(parent.get('isPublished')).to.equal(true);