Merge pull request #3728 from strongloop/update-eslint-config

Update eslint and eslint-config to latest

package.json

@@ -68,14 +68,16 @@
     "cookie-parser": "^1.3.4",
     "coveralls": "^2.11.15",
     "dirty-chai": "^1.2.2",
-    "eslint-config-loopback": "^8.0.0",
+    "eslint": "^4.13.1",
+    "eslint-config-loopback": "^10.0.0",
+    "eslint-plugin-mocha": "^4.11.0",
     "express-session": "^1.14.0",
     "grunt": "^1.0.1",
     "grunt-browserify": "^5.0.0",
     "grunt-cli": "^1.2.0",
     "grunt-contrib-uglify": "^2.0.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-eslint": "^19.0.0",
+    "grunt-eslint": "^20.1.0",
     "grunt-karma": "^2.0.0",
     "grunt-mocha-test": "^0.12.7",
     "karma": "^1.1.2",

test/access-token.test.js

@@ -649,7 +649,7 @@ describe('app.enableAuth()', function() {
       });
   });
 
-  it('prevent remote call with app setting status on denied ACL', function(done) {
+  it('denies remote call with app setting status 403', function(done) {
     createTestAppAndRequest(this.token, {app: {aclErrorStatus: 403}}, done)
       .del('/tests/123')
       .expect(403)
@@ -667,7 +667,7 @@ describe('app.enableAuth()', function() {
       });
   });
 
-  it('prevent remote call with app setting status on denied ACL', function(done) {
+  it('denies remote call with app setting status 404', function(done) {
     createTestAppAndRequest(this.token, {model: {aclErrorStatus: 404}}, done)
       .del('/tests/123')
       .expect(404)

test/app.test.js

@@ -523,7 +523,7 @@ describe('app', function() {
       });
     });
 
-    it('scopes middleware to a list of scopes', function(done) {
+    it('scopes middleware from config to a list of scopes', function(done) {
       var steps = [];
       app.middlewareFromConfig(
         function factory() {

test/model.application.test.js

@@ -15,7 +15,7 @@ describe('Application', function() {
     Application.attachTo(loopback.memory());
   });
 
-  it('honors `application.register` - promise variant', function(done) {
+  it('honors `application.register` - callback variant', function(done) {
     Application.register('rfeng', 'MyTestApp',
       {description: 'My test application'}, function(err, result) {
         var app = result;

test/relations.integration.js

@@ -996,7 +996,7 @@ describe('relations - integration', function() {
         });
     });
 
-    it('returns the embedded models', function(done) {
+    it('includes the created embedded model', function(done) {
       var url = '/api/todo-lists/' + this.todoList.id + '/items';
 
       this.get(url)
@@ -1311,7 +1311,7 @@ describe('relations - integration', function() {
         });
     });
 
-    it('returns the referenced models - verify', function(done) {
+    it('returns the referenced models without the deleted one', function(done) {
       var url = '/api/recipes/' + this.recipe.id + '/ingredients';
       var test = this;
 
@@ -1370,7 +1370,7 @@ describe('relations - integration', function() {
         });
     });
 
-    it('returns the referenced models - verify', function(done) {
+    it('returns the referenced models without the unlinked one', function(done) {
       var url = '/api/recipes/' + this.recipe.id + '/ingredients';
       var test = this;
 

test/role.test.js

@@ -977,16 +977,6 @@ describe('role model', function() {
         done();
       });
     });
-
-    it('should report isMappedToRole by app.name', function(done) {
-      ACL.isMappedToRole(ACL.APP, app.name, 'admin', function(err, flag) {
-        if (err) return done(err);
-
-        expect(flag).to.eql(true);
-
-        done();
-      });
-    });
   });
 
   describe('listByPrincipalType', function() {