Merge branch 'master' into tests-db-tweak

salesforce · Aug 14, 2017 · d659ce1 · d659ce1
2 parents 8d71b58 + a1fec51
commit d659ce1
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 128 deletions.
diff --git a/tests/enforceToken/collector/post.js b/tests/enforceToken/collector/post.js
@@ -47,7 +47,7 @@ describe(`api: POST ${path}`, () => {
       const deRegisterPath = `/v1/collectors/${res.body.id}/deregister`;
       return Collector.destroy({
         where: {},
-        truncate: true
+        truncate: true,
       })
       .then(() => {
         api.post(deRegisterPath)

diff --git a/tests/enforceToken/createToken.js b/tests/enforceToken/createToken.js
@@ -25,7 +25,7 @@ describe('api: createToken', () => {
     .send(u.fakeUserCredentials)
     .end((err, res) => {
       if (err) {
-        done(err);
+        return done(err);
       }
 
       defaultToken = res.body.token;
@@ -40,13 +40,7 @@ describe('api: createToken', () => {
     .send({ name: 'newToken' })
     .expect(constants.httpStatus.FORBIDDEN)
     .expect(/No authorization token was found/)
-    .end((err) => {
-      if (err) {
-        return done(err);
-      }
-
-      done();
-    });
+    .end(done);
   });
 
   it('error if wrong token found provided', (done) => {
@@ -55,13 +49,7 @@ describe('api: createToken', () => {
     .send({ name: 'newToken' })
     .expect(constants.httpStatus.FORBIDDEN)
     .expect(/Invalid Token/)
-    .end((err) => {
-      if (err) {
-        return done(err);
-      }
-
-      done();
-    });
+    .end(done);
   });
 
   it('sucessful authentication, create token for user', (done) => {

diff --git a/tests/enforceToken/revoke.js b/tests/enforceToken/revoke.js
@@ -30,7 +30,7 @@ describe('enforceToken: revoke:', () => {
     .send(u.fakeUserCredentials)
     .end((err, res) => {
       if (err) {
-        done(err);
+        return done(err);
       }
 
       defaultToken = res.body.token;

diff --git a/tests/enforceToken/sampleUpsertBulk.js b/tests/enforceToken/sampleUpsertBulk.js
@@ -10,7 +10,6 @@
  * tests/tokenReq/sampleUpsertBulk.js
  */
 'use strict';
-
 const expect = require('chai').expect;
 const supertest = require('supertest');
 const api = supertest(require('../../index').app);
@@ -81,13 +80,7 @@ describe('api: POST ' + path, () => {
     ])
     .expect(constants.httpStatus.FORBIDDEN)
     .expect(/ForbiddenError/)
-    .end((err /* , res */) => {
-      if (err) {
-        return done(err);
-      }
-
-      done();
-    });
+    .end(done);
   });
 
   it('all succeed', (done) => {
@@ -103,12 +96,6 @@ describe('api: POST ' + path, () => {
       },
     ])
     .expect(constants.httpStatus.OK)
-    .end((err /* , res */) => {
-      if (err) {
-        return done(err);
-      }
-
-      done();
-    });
+    .end(done);
   });
 });
diff --git a/tests/enforceToken/subjectGetHierarchy.js b/tests/enforceToken/subjectGetHierarchy.js
@@ -10,7 +10,6 @@
  * tests/tokenReq/subjectGetHierarchy.js
  */
 'use strict';
-
 const supertest = require('supertest');
 const api = supertest(require('../../index').app);
 const constants = require('../../api/v1/constants');
@@ -46,7 +45,7 @@ describe(`api: GET ${path}`, () => {
       token = returnedToken;
       done();
     })
-    .catch((err) => done(err));
+    .catch(done);
   });
 
   before((done) => {
@@ -82,7 +81,7 @@ describe(`api: GET ${path}`, () => {
       password: 'abcd',
     }))
     .then(() => done())
-    .catch((err) => done(err));
+    .catch(done);
   });
 
   after(u.forceDelete);
@@ -93,13 +92,7 @@ describe(`api: GET ${path}`, () => {
       api.get(path.replace('{key}', ipar))
       .expect(constants.httpStatus.FORBIDDEN)
       .expect(/ForbiddenError/)
-      .end((err /* , res */) => {
-        if (err) {
-          return done(err);
-        }
-
-        done();
-      });
+      .end(done);
     });
     it('should be an empty object at the parent level (with token)', (done) => {
       api.get(path.replace('{key}', ipar))
@@ -109,13 +102,7 @@ describe(`api: GET ${path}`, () => {
         expect(res.body.samples).to.be.an('array');
         expect(res.body.samples).to.be.empty;
       })
-      .end((err /* , res */) => {
-        if (err) {
-          return done(err);
-        }
-
-        done();
-      });
+      .end(done);
     });
   });
 });
diff --git a/tests/enforceToken/verbs.js b/tests/enforceToken/verbs.js
@@ -26,13 +26,7 @@ describe('API verb token enforced tests', () => {
   it('GET docs without token should succeed', (done) => {
     api.get('/v1/docs/')
     .expect(constants.httpStatus.OK)
-    .end((err /* , res */) => {
-      if (err) {
-        done(err);
-      }
-
-      done();
-    });
+    .end(done);
   });
 
   describe('CRUD should require tokens', () => {
@@ -45,7 +39,7 @@ describe('API verb token enforced tests', () => {
       .expect(constants.httpStatus.CREATED)
       .end((err, res) => {
         if (err) {
-          done(err);
+          return done(err);
         }
 
         expect(res.body.token).to.be.defined;
@@ -64,7 +58,7 @@ describe('API verb token enforced tests', () => {
         .expect(constants.httpStatus.CREATED)
         .end((err, res) => {
           if (err) {
-            done(err);
+            return done(err);
           }
 
           expect(res.body.name).to.equal(NEW_SUBJECT);
@@ -114,13 +108,7 @@ describe('API verb token enforced tests', () => {
           .set('Authorization', `${defaultToken}xyz`)
           .expect(FORBIDDEN)
           .expect(/Invalid Token/)
-          .end((err) => {
-            if (err) {
-              done(err);
-            }
-
-            done();
-          });
+          .end(done);
         });
 
         it(`${VERB} ${path} appropriate token returns OK`, (done) => {
@@ -133,13 +121,7 @@ describe('API verb token enforced tests', () => {
           call
           .set('Authorization', defaultToken)
           .expect(expectedStatus)
-          .end((err) => {
-            if (err) {
-              done(err);
-            }
-
-            done();
-          });
+          .end(done);
         });
       }
 

diff --git a/tests/realtime/realtimeUtils.js b/tests/realtime/realtimeUtils.js
@@ -10,7 +10,6 @@
  * tests/realtime/realtimeUtils.js
  */
 'use strict';
-
 const expect = require('chai').expect;
 const realtimeUtils = require('../../realtime/utils');
 const tu = require('../testUtils');
@@ -91,7 +90,7 @@ describe('realtime utils Tests:', () => {
         subjectTagFilter: ['ea', 'na'],
         subjectTagFilterType: 'INCLUDE',
         statusFilter: ['OK'],
-        statusFilterType: 'INCLUDE'
+        statusFilterType: 'INCLUDE',
       });
     })
     .then((pers2) => {

diff --git a/tests/realtime/redisPublisher.js b/tests/realtime/redisPublisher.js
@@ -10,7 +10,6 @@
  * tests/realtime/redisPublisher.js
  */
 'use strict';
-
 const expect = require('chai').expect;
 const tu = require('../testUtils');
 const u = require('./utils');
@@ -66,8 +65,8 @@ describe('publishSample with redis cache on', () => {
   afterEach(rtu.flushRedis);
   after(() => tu.toggleOverride('enableRedisSampleStore', false));
 
-  it('certain fields in aspect should be array, and others' +
-    ' should be undefined', (done) => {
+  it('certain fields in aspect should be array, and others ' +
+  'should be undefined', (done) => {
     Sample.findOne({ where: { name: sampleName } })
     .then((sam) => publisher.publishSample(sam, null, sampleEvent.upd))
     .then((pubObj) => {
@@ -81,8 +80,8 @@ describe('publishSample with redis cache on', () => {
     .catch(done);
   });
 
-  it('certain fields in subject should be array, and others' +
-    ' should be undefined', (done) => {
+  it('certain fields in subject should be array, and others ' +
+  'should be undefined', (done) => {
     Sample.findOne({ where: { name: sampleName } })
     .then((sam) => publisher.publishSample(sam, null, sampleEvent.upd))
     .then((pubObj) => {
@@ -95,8 +94,8 @@ describe('publishSample with redis cache on', () => {
     .catch(done);
   });
 
-  it('when tried to publish sample without aspect,'+
-    ' aspect should be attached, along with subject', (done) => {
+  it('when tried to publish sample without aspect, ' +
+    'aspect should be attached, along with subject', (done) => {
     Sample.findOne({ where: { name: sampleName } })
     .then((sam) => {
       const sampInst = sam.get();
@@ -154,8 +153,8 @@ describe('redis Publisher', () => {
   after(u.forceDelete);
 
   describe('publishSample function tests: ', () => {
-    it('with EventType argument: sample should be published with subject  ' +
-      ' object and asbolutePath field', (done) => {
+    it('with EventType argument: sample should be published with subject ' +
+    'object and asbolutePath field', (done) => {
       Sample.findById(sampId)
       .then((sam) => publisher.publishSample(sam, Subject, sampleEvent.upd))
       .then((pubObj) => {
@@ -188,8 +187,8 @@ describe('redis Publisher', () => {
       .catch(done);
     });
 
-    it('when tried to publish sample without aspect,'+
-      ' aspect should be attached', (done) => {
+    it('when tried to publish sample without aspect, ' +
+    'aspect should be attached', (done) => {
       Sample.findById(sampId)
       .then((sam) => {
         const sampInst = sam.get();
@@ -217,18 +216,20 @@ describe('redis Publisher', () => {
   describe('getSampleEventType function tests: ', () => {
     it('update Event', (done) => {
       Sample.findById(sampId)
-      .then((sam) => sam.update({ value: 10}))
+      .then((sam) => sam.update({ value: 10 }))
       .then((updSample) => {
         // pass sequelize object
         let eventType = publisher.getSampleEventType(updSample);
         expect(eventType).to.equal(sampleEvent.upd);
+
         // pass plain object
         eventType = publisher.getSampleEventType(updSample.get());
         expect(eventType).to.equal(sampleEvent.upd);
         done();
       })
       .catch(done);
     });
+
     it('add Event', (done) => {
       Sample.upsertByName({
         name: subjectSA.name + '|' + humidity.name,
@@ -238,6 +239,7 @@ describe('redis Publisher', () => {
         // pass sequelize object
         let eventType = publisher.getSampleEventType(sam);
         expect(eventType).to.equal(sampleEvent.add);
+
         // pass plain object
         eventType = publisher.getSampleEventType(sam.get());
         expect(eventType).to.equal(sampleEvent.add);

diff --git a/tests/realtime/setupSocketIO.js b/tests/realtime/setupSocketIO.js
@@ -10,7 +10,6 @@
  * tests/realtime/setupSocketIO.js
  */
 'use strict';
-
 const expect = require('chai').expect;
 const tu = require('../testUtils');
 const socketIOSetup = require('../../realtime/setupSocketIO');
@@ -46,7 +45,7 @@ describe('socket.io setup', () => {
         subjectTagFilter: ['ea', 'na'],
         subjectTagFilterType: 'INCLUDE',
         statusFilter: ['OK'],
-        statusFilterType: 'INCLUDE'
+        statusFilterType: 'INCLUDE',
       }))
       .then(() => done())
       .catch(done);
@@ -118,7 +117,7 @@ describe('socket.io setup', () => {
         subjectTagFilter: ['ea', 'na'],
         subjectTagFilterType: 'INCLUDE',
         statusFilter: ['OK'],
-        statusFilterType: 'INCLUDE'
+        statusFilterType: 'INCLUDE',
       }))
       .then(() => done())
       .catch(done);

diff --git a/tests/realtime/utils.js b/tests/realtime/utils.js
@@ -10,11 +10,9 @@
  * tests/realtime/utils.js
  */
 'use strict'; // eslint-disable-line strict
-
 const tu = require('../testUtils');
 const path = require('path');
 const fs = require('fs');
-
 const testStartTime = new Date();
 
 module.exports = {
@@ -45,6 +43,6 @@ module.exports = {
     .then(() => tu.forceDelete(tu.db.Subject, testStartTime))
     .then(() => tu.forceDelete(tu.db.Aspect, testStartTime))
     .then(() => done())
-    .catch((err) => done(err));
+    .catch(done);
   },
 };
diff --git a/tests/roomFlag/roomFlagDisabled.js b/tests/roomFlag/roomFlagDisabled.js
@@ -10,7 +10,6 @@
  * tests/api/v1/roomFlag/roomFlagDisabled.js
  */
 'use strict';
-
 const supertest = require('supertest');
 const api = supertest(require('../../index').app);
 const constants = require('../../api/v1/constants');
@@ -21,13 +20,6 @@ describe('Rooms path is found', () => {
   it('GET is found', (done) => {
     api.get(path)
     .expect(constants.httpStatus.NOT_FOUND)
-    .end((err /* , res */) => {
-      if (err) {
-        return done(err);
-      }
-
-      done();
-    });
+    .end(done);
   });
 });
-