Merge pull request #2970 from strongloop/fix/remove-unused-expressions

Re-enable "no-unused-expressions" rule for eslint

Author: bajtos

.eslintrc

@@ -5,7 +5,6 @@
       "ignoreComments": true,
       "ignoreUrls": true,
       "ignorePattern": "^\\s*var\\s.+=\\s*(require\\s*\\()|(/)"
-    }],
-  "no-unused-expressions": "off",
+    }]
   }
 }

package.json

@@ -66,6 +66,7 @@
     "browserify": "^13.1.0",
     "chai": "^3.5.0",
     "cookie-parser": "^1.3.4",
+    "dirty-chai": "^1.2.2",
     "es5-shim": "^4.1.0",
     "eslint-config-loopback": "^5.0.0",
     "express-session": "^1.14.0",

test/access-control.integration.js

@@ -159,7 +159,7 @@ describe('access control - integration', function() {
       roleModel.registerResolver('$dynamic-role', function(role, context, callback) {
         if (!(context && context.accessToken && context.accessToken.userId)) {
           return process.nextTick(function() {
-            callback && callback(null, false);
+            if (callback) callback(null, false);
           });
         }
         var accessToken = context.accessToken;
@@ -216,7 +216,7 @@ describe('access control - integration', function() {
           if (context.remotingContext) {
             count++;
           }
-          callback && callback(null, false); // Always true
+          if (callback) callback(null, false); // Always true
         });
       });
     });

test/access-token.test.js

@@ -5,7 +5,7 @@
 
 'use strict';
 var assert = require('assert');
-var expect = require('chai').expect;
+var expect = require('./helpers/expect');
 var cookieParser = require('cookie-parser');
 var LoopBackContext = require('loopback-context');
 var contextMiddleware = require('loopback-context').perRequest;

test/app.test.js

@@ -14,7 +14,7 @@ var loopback = require('../');
 var PersistedModel = loopback.PersistedModel;
 
 var describe = require('./util/describe');
-var expect = require('chai').expect;
+var expect = require('./helpers/expect');
 var it = require('./util/it');
 var request = require('supertest');
 
@@ -91,7 +91,7 @@ describe('app', function() {
       app.middleware('routes:before',
         myHandler = handlerThatAddsHandler('my-handler'));
       var found = app._findLayerByHandler(myHandler);
-      expect(found).to.be.object;
+      expect(found).to.be.an('object');
       expect(myHandler).to.equal(found.handle);
       expect(found).have.property('phase', 'routes:before');
       executeMiddlewareHandlers(app, function(err) {
@@ -112,7 +112,7 @@ describe('app', function() {
         wrappedHandler['__NR_handler'] = myHandler;
         app.middleware('routes:before', wrappedHandler);
         var found = app._findLayerByHandler(myHandler);
-        expect(found).to.be.object;
+        expect(found).to.be.an('object');
         expect(found).have.property('phase', 'routes:before');
         executeMiddlewareHandlers(app, function(err) {
           if (err) return done(err);
@@ -132,7 +132,7 @@ describe('app', function() {
         wrappedHandler['__handler'] = myHandler;
         app.middleware('routes:before', wrappedHandler);
         var found = app._findLayerByHandler(myHandler);
-        expect(found).to.be.object;
+        expect(found).to.be.an('object');
         expect(found).have.property('phase', 'routes:before');
         executeMiddlewareHandlers(app, function(err) {
           if (err) return done(err);
@@ -380,7 +380,7 @@ describe('app', function() {
       executeMiddlewareHandlers(app, '/mountpath/test', function(err) {
         if (err) return done(err);
 
-        expect(mountWasEmitted, 'mountWasEmitted').to.be.true;
+        expect(mountWasEmitted, 'mountWasEmitted').to.be.true();
         expect(data).to.eql({
           mountpath: '/mountpath',
           parent: app,
@@ -666,7 +666,7 @@ describe('app', function() {
         remotedClass = sharedClass;
       });
       app.model(Color);
-      expect(remotedClass).to.exist;
+      expect(remotedClass).to.exist();
       expect(remotedClass).to.eql(Color.sharedClass);
     });
 
@@ -680,9 +680,9 @@ describe('app', function() {
       });
       app.model(Color);
       app.models.Color.disableRemoteMethodByName('findOne');
-      expect(remoteMethodDisabledClass).to.exist;
+      expect(remoteMethodDisabledClass).to.exist();
       expect(remoteMethodDisabledClass).to.eql(Color.sharedClass);
-      expect(disabledRemoteMethod).to.exist;
+      expect(disabledRemoteMethod).to.exist();
       expect(disabledRemoteMethod).to.eql('findOne');
     });
 

test/change-stream.test.js

@@ -4,7 +4,7 @@
 // License text available at https://opensource.org/licenses/MIT
 
 'use strict';
-var expect = require('chai').expect;
+var expect = require('./helpers/expect');
 var loopback = require('../');
 
 describe('PersistedModel.createChangeStream()', function() {

test/change.test.js

@@ -6,7 +6,7 @@
 'use strict';
 var assert = require('assert');
 var async = require('async');
-var expect = require('chai').expect;
+var expect = require('./helpers/expect');
 var loopback = require('../');
 
 var Change, TestModel;

test/checkpoint.test.js

@@ -6,7 +6,7 @@
 'use strict';
 var async = require('async');
 var loopback = require('../');
-var expect = require('chai').expect;
+var expect = require('./helpers/expect');
 
 var Checkpoint = loopback.Checkpoint.extend('TestCheckpoint');
 

test/error-handler.test.js

@@ -8,7 +8,7 @@ var loopback = require('../');
 var app;
 var assert = require('assert');
 var request = require('supertest');
-var expect = require('chai').expect;
+var expect = require('./helpers/expect');
 
 describe('loopback.errorHandler(options)', function() {
   it('should throw a descriptive error', function() {

test/helpers/expect.js

@@ -0,0 +1,12 @@
+// Copyright IBM Corp. 2013,2016. All Rights Reserved.
+// Node module: loopback
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+'use strict';
+
+var chai = require('chai');
+chai.use(require('dirty-chai'));
+chai.use(require('sinon-chai'));
+
+module.exports = chai.expect;