Merge branch 'master' into redis-config-refactor

salesforce · Aug 14, 2017 · c28a6f9 · c28a6f9
2 parents 599cfb9 + 2792259
commit c28a6f9
Show file tree

Hide file tree

Showing 91 changed files with 513 additions and 748 deletions.
diff --git a/tests/db/helpers/common.js b/tests/db/helpers/common.js
@@ -10,7 +10,6 @@
  * tests/db/helpers/common.js
  */
 'use strict';
-
 const expect = require('chai').expect;
 const tu = require('../../testUtils');
 const u = require('../model/subject/utils');
@@ -76,7 +75,7 @@ describe('utility function tests:', () => {
       .catch(done);
     });
 
-    it('update a model instance field with the same filed'+
+    it('update a model instance field with the same field ' +
       'in ignoreAttributes', (done) => {
       const par = { name: `${tu.namePrefix}Eta`, isPublished: false };
       Subject.create(par)
@@ -92,8 +91,8 @@ describe('utility function tests:', () => {
       .catch(done);
     });
   });
-  describe('test sampleAspectAndSubjectArePublished and' +
-    ' augmentSampleWithSubjectAspectInfo function:', () => {
+  describe('test sampleAspectAndSubjectArePublished and ' +
+    'augmentSampleWithSubjectAspectInfo function:', () => {
     let sub;
     before((done) => {
       Aspect.create({

diff --git a/tests/db/helpers/sampleUtils.js b/tests/db/helpers/sampleUtils.js
@@ -10,11 +10,10 @@
  * tests/db/helpers/sampleUtils.js
  */
 'use strict';
-
 const expect = require('chai').expect;
 const sampleUtils = require('../../../db/helpers/sampleUtils');
 
-const testBooleanAspects = {
+const booleanAspects = {
   criticalTrueOkFalse: {
     criticalRange: [1, 1],
     okRange: [0, 0],
@@ -45,45 +44,37 @@ const testBooleanAspects = {
 describe('sampleUtils Tests:', () => {
   describe('computeStatus', () => {
     it('criticalTrueOkFalse', () => {
-      expect(sampleUtils.computeStatus(
-        testBooleanAspects.criticalTrueOkFalse,
+      expect(sampleUtils.computeStatus(booleanAspects.criticalTrueOkFalse,
         'true')).to.equal('Critical');
-      expect(sampleUtils.computeStatus(
-        testBooleanAspects.criticalTrueOkFalse,
+      expect(sampleUtils.computeStatus(booleanAspects.criticalTrueOkFalse,
         'false')).to.equal('OK');
-      expect(sampleUtils.computeStatus(
-        testBooleanAspects.criticalTrueOkFalse,
+      expect(sampleUtils.computeStatus(booleanAspects.criticalTrueOkFalse,
         '4')).to.equal('Invalid');
     });
 
     it('criticalFalseOkTrue', () => {
-      expect(sampleUtils.computeStatus(
-        testBooleanAspects.criticalFalseOkTrue,
+      expect(sampleUtils.computeStatus(booleanAspects.criticalFalseOkTrue,
         'false')).to.equal('Critical');
-      expect(sampleUtils.computeStatus(
-        testBooleanAspects.criticalFalseOkTrue,
+      expect(sampleUtils.computeStatus(booleanAspects.criticalFalseOkTrue,
         'true')).to.equal('OK');
-      expect(sampleUtils.computeStatus(
-        testBooleanAspects.criticalFalseOkTrue,
+      expect(sampleUtils.computeStatus(booleanAspects.criticalFalseOkTrue,
         'Warning')).to.equal('Invalid');
     });
 
     it('warningFalseInfoTrue', () => {
-      expect(sampleUtils.computeStatus(
-        testBooleanAspects.warningFalseInfoTrue,
+      expect(sampleUtils.computeStatus(booleanAspects.warningFalseInfoTrue,
         'false')).to.equal('Warning');
-      expect(sampleUtils.computeStatus(
-        testBooleanAspects.warningFalseInfoTrue,
+      expect(sampleUtils.computeStatus(booleanAspects.warningFalseInfoTrue,
         'true')).to.equal('Info');
     });
 
     it('multipleTruesCriticalOkFalse', () => {
       expect(sampleUtils.computeStatus(
-        testBooleanAspects.multipleTruesCriticalOkFalse,
-        'true')).to.equal('Critical');
+        booleanAspects.multipleTruesCriticalOkFalse, 'true'))
+      .to.equal('Critical');
       expect(sampleUtils.computeStatus(
-        testBooleanAspects.multipleTruesCriticalOkFalse,
-        'false')).to.equal('OK');
+        booleanAspects.multipleTruesCriticalOkFalse, 'false'))
+      .to.equal('OK');
     });
   });
 });