Add eslint to npm test, fix linter issues

This commit is contained in:
Miroslav Bajtoš 2017-12-11 14:51:48 +01:00
parent d6a5c768fd
commit 55cb88f727
No known key found for this signature in database
GPG Key ID: 6F2304BA9361C7E3
11 changed files with 184 additions and 328 deletions

1
.eslintignore Normal file
View File

@ -0,0 +1 @@
coverage

133
.eslintrc
View File

@ -1,134 +1,3 @@
{ {
"env": { "extends": "loopback"
"browser": false,
"node": true,
"amd": true
},
"rules": {
"no-alert": 2,
"no-array-constructor": 2,
"no-bitwise": 2,
"no-caller": 2,
"no-catch-shadow": 2,
"no-comma-dangle": 2,
"no-cond-assign": 2,
"no-console": 1,
"no-constant-condition": 2,
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-div-regex": 1,
"no-dupe-keys": 2,
"no-else-return": 2,
"no-empty": 2,
"no-empty-class": 2,
"no-empty-label": 2,
"no-eq-null": 2,
"no-eval": 2,
"no-ex-assign": 2,
"no-extend-native": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": 1,
"no-extra-semi": 2,
"no-extra-strict": 2,
"no-fallthrough": 2,
"no-floating-decimal": 1,
"no-func-assign": 2,
"no-global-strict": 2,
"no-implied-eval": 2,
"no-inner-declarations": [2, "functions"],
"no-invalid-regexp": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-lonely-if": 2,
"no-loop-func": 2,
"no-mixed-requires": [2, false],
"no-multi-str": 2,
"no-native-reassign": 2,
"no-negated-in-lhs": 2,
"no-nested-ternary": 1,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-require": 1,
"no-new-wrappers": 2,
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-path-concat": 0,
"no-plusplus": 2,
"no-process-exit": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-restricted-modules": 0,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 0,
"no-sequences": 2,
"no-shadow": 2,
"no-shadow-restricted-names": 2,
"no-spaced-func": 2,
"no-space-before-semi": 2,
"no-sparse-arrays": 2,
"no-sync": 0,
"no-ternary": 2,
"no-trailing-spaces": 2,
"no-undef": 2,
"no-undefined": 1,
"no-undef-init": 2,
"no-underscore-dangle": 0,
"no-unreachable": 2,
"no-unused-expressions": 2,
"no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
"no-use-before-define": 2,
"no-warning-comments": [1, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
"no-with": 2,
"no-wrap-func": 2,
"no-mixed-spaces-and-tabs": [2, false],
"block-scoped-var": 1,
"brace-style": [2, "1tbs"],
"camelcase": 2,
"complexity": [0, 11],
"consistent-return": 2,
"consistent-this": [2, "that"],
"curly": [2, "all"],
"default-case": 1,
"dot-notation": 2,
"eol-last": 2,
"eqeqeq": 2,
"func-names": 0,
"func-style": [2, "declaration"],
"guard-for-in": 1,
"max-depth": [0, 4],
"max-len": [1, 80, 4],
"max-nested-callbacks": [1, 2],
"max-params": [0, 3],
"max-statements": [0, 10],
"handle-callback-err": 1,
"new-cap": 2,
"new-parens": 2,
"one-var": 0,
"quote-props": 1,
"quotes": [2, "single"],
"radix": 2,
"semi": 2,
"sort-vars": 1,
"space-after-keywords": [2, "always"],
"space-in-brackets": [1, "never"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-word-ops": 1,
"strict": 0,
"use-isnan": 2,
"valid-jsdoc": 2,
"valid-typeof": 2,
"wrap-iife": 1,
"wrap-regex": 1,
"yoda": [2, "never"]
}
} }

View File

@ -3,6 +3,8 @@
// This file is licensed under the MIT License. // This file is licensed under the MIT License.
// License text available at https://opensource.org/licenses/MIT // License text available at https://opensource.org/licenses/MIT
'use strict';
/* global module:false */ /* global module:false */
module.exports = function(grunt) { module.exports = function(grunt) {
// Project configuration. // Project configuration.
@ -15,46 +17,34 @@ module.exports = function(grunt) {
'* Copyright (c) <%= grunt.template.today("yyyy") %> ' + '* Copyright (c) <%= grunt.template.today("yyyy") %> ' +
'<%= pkg.author.name %>;' + '<%= pkg.author.name %>;' +
' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n', ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
// Task configuration.
jshint: {
options: {
jshintrc: true
},
gruntfile: {
src: 'Gruntfile.js'
},
libTest: {
src: ['lib/**/*.js', 'test/**/*.js']
}
},
mochaTest: { mochaTest: {
'integration': { 'integration': {
src: 'test/integration/*.js', src: 'test/integration/*.js',
options: { options: {
reporter: 'dot' reporter: 'dot',
} },
}, },
'integration-xml': { 'integration-xml': {
src: 'test/integration/*.js', src: 'test/integration/*.js',
options: { options: {
reporter: 'xunit', reporter: 'xunit',
captureFile: 'xintegration.xml' captureFile: 'xintegration.xml',
} },
}, },
'unit': { 'unit': {
src: 'test/*.js', src: 'test/*.js',
options: { options: {
reporter: 'dot' reporter: 'dot',
} },
}, },
'unit-xml': { 'unit-xml': {
src: 'test/*.js', src: 'test/*.js',
options: { options: {
reporter: 'xunit', reporter: 'xunit',
captureFile: 'xunit.xml' captureFile: 'xunit.xml',
} },
} },
} },
}); });
// These plugins provide necessary tasks. // These plugins provide necessary tasks.

View File

@ -1,6 +0,0 @@
// Copyright IBM Corp. 2014. All Rights Reserved.
// Node module: loopback-connector-remote
// This file is licensed under the MIT License.
// License text available at https://opensource.org/licenses/MIT
module.exports = require('./lib/remote-connector');

View File

@ -231,6 +231,6 @@ function defineRelationProperty(modelClass, def) {
return that['__findById__' + def.name].apply(that, arguments); return that['__findById__' + def.name].apply(that, arguments);
}; };
return scope; return scope;
} },
}); });
} }

View File

@ -48,7 +48,6 @@ function RemoteConnector(settings) {
// handle mixins in the define() method // handle mixins in the define() method
var DAO = this.DataAccessObject = function() { var DAO = this.DataAccessObject = function() {
}; };
} }
RemoteConnector.prototype.connect = function() { RemoteConnector.prototype.connect = function() {

View File

@ -2,7 +2,7 @@
"name": "loopback-connector-remote", "name": "loopback-connector-remote",
"version": "3.2.0", "version": "3.2.0",
"description": "Remote REST API connector for Loopback", "description": "Remote REST API connector for Loopback",
"main": "index.js", "main": "lib/remote-connector.js",
"keywords": [ "keywords": [
"web", "web",
"restful", "restful",
@ -10,7 +10,9 @@
"StrongLoop" "StrongLoop"
], ],
"scripts": { "scripts": {
"test": "grunt" "test": "grunt",
"posttest": "npm run lint",
"lint": "eslint ."
}, },
"engines": { "engines": {
"node": ">=4.0.0" "node": ">=4.0.0"
@ -29,6 +31,8 @@
}, },
"homepage": "http://loopback.io", "homepage": "http://loopback.io",
"dependencies": { "dependencies": {
"eslint": "^4.13.0",
"eslint-config-loopback": "^8.0.0",
"loopback-datasource-juggler": "^3.0.0", "loopback-datasource-juggler": "^3.0.0",
"strong-remoting": "^3.0.0" "strong-remoting": "^3.0.0"
}, },
@ -37,7 +41,6 @@
"bluebird": "^3.3.5", "bluebird": "^3.3.5",
"grunt": "^1.0.1", "grunt": "^1.0.1",
"grunt-cli": "^1.2.0", "grunt-cli": "^1.2.0",
"grunt-contrib-jshint": "^1.0.0",
"grunt-mocha-test": "^0.12.7", "grunt-mocha-test": "^0.12.7",
"loopback": "^3.0.0", "loopback": "^3.0.0",
"mocha": "^3.0.2", "mocha": "^3.0.2",

View File

@ -39,7 +39,7 @@ function createMemoryDataSource(app) {
function createRemoteDataSource(app, serverApp) { function createRemoteDataSource(app, serverApp) {
return app.dataSource('remote', { return app.dataSource('remote', {
url: 'http://' + serverApp.get('host') + ':' + serverApp.get('port'), url: 'http://' + serverApp.get('host') + ':' + serverApp.get('port'),
connector: remoteConnector connector: remoteConnector,
}); });
} }
@ -51,6 +51,6 @@ function getUserProperties() {
'password': String, 'password': String,
'gender': String, 'gender': String,
'domain': String, 'domain': String,
'email': String 'email': String,
}; };
} }

View File

@ -138,7 +138,7 @@ describe('Model tests', function() {
user.updateAttributes({ user.updateAttributes({
first: 'updatedFirst', first: 'updatedFirst',
last: 'updatedLast' last: 'updatedLast',
}, function(err, updatedUser) { }, function(err, updatedUser) {
if (err) return done(err); if (err) return done(err);
assert.equal(updatedUser.first, 'updatedFirst'); assert.equal(updatedUser.first, 'updatedFirst');

View File

@ -99,8 +99,8 @@ describe('Custom Path', function() {
ServerModel = app.registry.createModel({ ServerModel = app.registry.createModel({
name: 'TestModel', name: 'TestModel',
options: { options: {
http: {path: '/custom'} http: {path: '/custom'},
} },
}); });
app.model(ServerModel, {dataSource: db}); app.model(ServerModel, {dataSource: db});
@ -115,8 +115,8 @@ describe('Custom Path', function() {
name: 'TestModel', name: 'TestModel',
options: { options: {
dataSource: 'remote', dataSource: 'remote',
http: {path: '/custom'} http: {path: '/custom'},
} },
}); });
app.model(ClientModel, {dataSource: remoteDs}); app.model(ClientModel, {dataSource: remoteDs});
}); });

View File

@ -76,7 +76,7 @@ describe('Remote model tests', function() {
user.updateAttributes({ user.updateAttributes({
first: 'updatedFirst', first: 'updatedFirst',
last: 'updatedLast' last: 'updatedLast',
}, function(err, updatedUser) { }, function(err, updatedUser) {
if (err) return done(err); if (err) return done(err);
assert.equal(updatedUser.first, 'updatedFirst'); assert.equal(updatedUser.first, 'updatedFirst');