Add eslint to npm test, fix linter issues
This commit is contained in:
parent
d6a5c768fd
commit
55cb88f727
|
@ -0,0 +1 @@
|
||||||
|
coverage
|
133
.eslintrc
133
.eslintrc
|
@ -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"]
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
36
Gruntfile.js
36
Gruntfile.js
|
@ -3,7 +3,9 @@
|
||||||
// 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
|
||||||
|
|
||||||
/*global module:false*/
|
'use strict';
|
||||||
|
|
||||||
|
/* global module:false */
|
||||||
module.exports = function(grunt) {
|
module.exports = function(grunt) {
|
||||||
// Project configuration.
|
// Project configuration.
|
||||||
grunt.initConfig({
|
grunt.initConfig({
|
||||||
|
@ -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.
|
||||||
|
|
6
index.js
6
index.js
|
@ -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');
|
|
|
@ -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;
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ module.exports = RemoteConnector;
|
||||||
function RemoteConnector(settings) {
|
function RemoteConnector(settings) {
|
||||||
assert(typeof settings ===
|
assert(typeof settings ===
|
||||||
'object',
|
'object',
|
||||||
'cannot initialize RemoteConnector without a settings object');
|
'cannot initialize RemoteConnector without a settings object');
|
||||||
this.client = settings.client;
|
this.client = settings.client;
|
||||||
this.adapter = settings.adapter || 'rest';
|
this.adapter = settings.adapter || 'rest';
|
||||||
this.protocol = settings.protocol || 'http';
|
this.protocol = settings.protocol || 'http';
|
||||||
|
@ -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() {
|
||||||
|
@ -67,7 +66,7 @@ RemoteConnector.prototype.define = function(definition) {
|
||||||
var remotes = this.remotes;
|
var remotes = this.remotes;
|
||||||
|
|
||||||
assert(Model.sharedClass,
|
assert(Model.sharedClass,
|
||||||
'cannot attach ' +
|
'cannot attach ' +
|
||||||
Model.modelName +
|
Model.modelName +
|
||||||
' to a remote connector without a Model.sharedClass');
|
' to a remote connector without a Model.sharedClass');
|
||||||
|
|
||||||
|
|
|
@ -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",
|
||||||
|
|
|
@ -22,7 +22,7 @@ function createRestAppAndListen() {
|
||||||
|
|
||||||
app.set('legacyExplorer', false);
|
app.set('legacyExplorer', false);
|
||||||
app.set('remoting', {
|
app.set('remoting', {
|
||||||
errorHandler: { debug: true, log: false },
|
errorHandler: {debug: true, log: false},
|
||||||
context: false,
|
context: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -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,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,34 +27,34 @@ describe('Model tests', function() {
|
||||||
|
|
||||||
describe('Model.validatesPresenceOf(properties...)', function() {
|
describe('Model.validatesPresenceOf(properties...)', function() {
|
||||||
it('should require a model to include a property to be considered valid',
|
it('should require a model to include a property to be considered valid',
|
||||||
function() {
|
function() {
|
||||||
User.validatesPresenceOf('first', 'last', 'age');
|
User.validatesPresenceOf('first', 'last', 'age');
|
||||||
const joe = new User({first: 'joe'});
|
const joe = new User({first: 'joe'});
|
||||||
assert(joe.isValid() === false, 'model should not validate');
|
assert(joe.isValid() === false, 'model should not validate');
|
||||||
assert(joe.errors.last, 'should have a missing last error');
|
assert(joe.errors.last, 'should have a missing last error');
|
||||||
assert(joe.errors.age, 'should have a missing age error');
|
assert(joe.errors.age, 'should have a missing age error');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Model.validatesLengthOf(property, options)', function() {
|
describe('Model.validatesLengthOf(property, options)', function() {
|
||||||
it('should require a property length to be within a specified range',
|
it('should require a property length to be within a specified range',
|
||||||
function() {
|
function() {
|
||||||
User.validatesLengthOf('password', {min: 5, message: {min:
|
User.validatesLengthOf('password', {min: 5, message: {min:
|
||||||
'Password is too short'}});
|
'Password is too short'}});
|
||||||
const joe = new User({password: '1234'});
|
const joe = new User({password: '1234'});
|
||||||
assert(joe.isValid() === false, 'model should not be valid');
|
assert(joe.isValid() === false, 'model should not be valid');
|
||||||
assert(joe.errors.password, 'should have password error');
|
assert(joe.errors.password, 'should have password error');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Model.validatesInclusionOf(property, options)', function() {
|
describe('Model.validatesInclusionOf(property, options)', function() {
|
||||||
it('should require a value for `property` to be in the specified array',
|
it('should require a value for `property` to be in the specified array',
|
||||||
function() {
|
function() {
|
||||||
User.validatesInclusionOf('gender', {in: ['male', 'female']});
|
User.validatesInclusionOf('gender', {in: ['male', 'female']});
|
||||||
const foo = new User({gender: 'bar'});
|
const foo = new User({gender: 'bar'});
|
||||||
assert(foo.isValid() === false, 'model should not be valid');
|
assert(foo.isValid() === false, 'model should not be valid');
|
||||||
assert(foo.errors.gender, 'should have gender error');
|
assert(foo.errors.gender, 'should have gender error');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Model.validatesExclusionOf(property, options)', function() {
|
describe('Model.validatesExclusionOf(property, options)', function() {
|
||||||
|
@ -107,63 +107,63 @@ describe('Model tests', function() {
|
||||||
|
|
||||||
describe('Model.create([data], [callback])', function() {
|
describe('Model.create([data], [callback])', function() {
|
||||||
it('should create an instance and save to the attached data source',
|
it('should create an instance and save to the attached data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
User.create({first: 'Joe', last: 'Bob'}, function(err, user) {
|
User.create({first: 'Joe', last: 'Bob'}, function(err, user) {
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert(user instanceof User);
|
assert(user instanceof User);
|
||||||
done();
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('model.save([options], [callback])', function() {
|
describe('model.save([options], [callback])', function() {
|
||||||
it('should save an instance of a Model to the attached data source',
|
it('should save an instance of a Model to the attached data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
const joe = new User({first: 'Joe', last: 'Bob'});
|
const joe = new User({first: 'Joe', last: 'Bob'});
|
||||||
joe.save(function(err, user) {
|
joe.save(function(err, user) {
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert(user.id);
|
assert(user.id);
|
||||||
assert(!user.errors);
|
assert(!user.errors);
|
||||||
done();
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('model.updateAttributes(data, [callback])', function() {
|
describe('model.updateAttributes(data, [callback])', function() {
|
||||||
it('should save specified attributes to the attached data source',
|
it('should save specified attributes to the attached data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
User.create({first: 'joe', age: 100}, function(err, user) {
|
User.create({first: 'joe', age: 100}, function(err, user) {
|
||||||
if (err) return done(err);
|
|
||||||
assert.equal(user.first, 'joe');
|
|
||||||
|
|
||||||
user.updateAttributes({
|
|
||||||
first: 'updatedFirst',
|
|
||||||
last: 'updatedLast'
|
|
||||||
}, function(err, updatedUser) {
|
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert.equal(updatedUser.first, 'updatedFirst');
|
assert.equal(user.first, 'joe');
|
||||||
assert.equal(updatedUser.last, 'updatedLast');
|
|
||||||
assert.equal(updatedUser.age, 100);
|
user.updateAttributes({
|
||||||
done();
|
first: 'updatedFirst',
|
||||||
|
last: 'updatedLast',
|
||||||
|
}, function(err, updatedUser) {
|
||||||
|
if (err) return done(err);
|
||||||
|
assert.equal(updatedUser.first, 'updatedFirst');
|
||||||
|
assert.equal(updatedUser.last, 'updatedLast');
|
||||||
|
assert.equal(updatedUser.age, 100);
|
||||||
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Model.upsert(data, callback)', function() {
|
describe('Model.upsert(data, callback)', function() {
|
||||||
it('should update when a record with id=data.id is found, insert otherwise',
|
it('should update when a record with id=data.id is found, insert otherwise',
|
||||||
function(done) {
|
function(done) {
|
||||||
User.upsert({first: 'joe', id: 7}, function(err, user) {
|
User.upsert({first: 'joe', id: 7}, function(err, user) {
|
||||||
if (err) return done(err);
|
|
||||||
assert.equal(user.first, 'joe');
|
|
||||||
|
|
||||||
User.upsert({first: 'bob', id: 7}, function(err, updatedUser) {
|
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert.equal(updatedUser.first, 'bob');
|
assert.equal(user.first, 'joe');
|
||||||
done();
|
|
||||||
|
User.upsert({first: 'bob', id: 7}, function(err, updatedUser) {
|
||||||
|
if (err) return done(err);
|
||||||
|
assert.equal(updatedUser.first, 'bob');
|
||||||
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('model.destroy([callback])', function() {
|
describe('model.destroy([callback])', function() {
|
||||||
|
@ -188,19 +188,19 @@ describe('Model tests', function() {
|
||||||
|
|
||||||
describe('Model.deleteById(id, [callback])', function() {
|
describe('Model.deleteById(id, [callback])', function() {
|
||||||
it('should delete a model instance from the attached data source',
|
it('should delete a model instance from the attached data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
User.create({first: 'joe', last: 'bob'}, function(err, user) {
|
User.create({first: 'joe', last: 'bob'}, function(err, user) {
|
||||||
if (err) return done(err);
|
|
||||||
User.deleteById(user.id, function(err) {
|
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
User.findById(user.id, function(err, notFound) {
|
User.deleteById(user.id, function(err) {
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert.equal(notFound, null);
|
User.findById(user.id, function(err, notFound) {
|
||||||
done();
|
if (err) return done(err);
|
||||||
|
assert.equal(notFound, null);
|
||||||
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Model.findById(id, callback)', function() {
|
describe('Model.findById(id, callback)', function() {
|
||||||
|
@ -221,21 +221,21 @@ describe('Model tests', function() {
|
||||||
|
|
||||||
describe('Model.count([query], callback)', function() {
|
describe('Model.count([query], callback)', function() {
|
||||||
it('should return the count of Model instances in data source',
|
it('should return the count of Model instances in data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
const taskEmitter = new TaskEmitter();
|
const taskEmitter = new TaskEmitter();
|
||||||
taskEmitter
|
taskEmitter
|
||||||
.task(User, 'create', {first: 'jill', age: 100})
|
.task(User, 'create', {first: 'jill', age: 100})
|
||||||
.task(User, 'create', {first: 'bob', age: 200})
|
.task(User, 'create', {first: 'bob', age: 200})
|
||||||
.task(User, 'create', {first: 'jan'})
|
.task(User, 'create', {first: 'jan'})
|
||||||
.task(User, 'create', {first: 'sam'})
|
.task(User, 'create', {first: 'sam'})
|
||||||
.task(User, 'create', {first: 'suzy'})
|
.task(User, 'create', {first: 'suzy'})
|
||||||
.on('done', function() {
|
.on('done', function() {
|
||||||
User.count({age: {gt: 99}}, function(err, count) {
|
User.count({age: {gt: 99}}, function(err, count) {
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert.equal(count, 2);
|
assert.equal(count, 2);
|
||||||
done();
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -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});
|
||||||
});
|
});
|
||||||
|
|
|
@ -45,119 +45,119 @@ describe('Remote model tests', function() {
|
||||||
|
|
||||||
describe('Model.create([data], [callback])', function() {
|
describe('Model.create([data], [callback])', function() {
|
||||||
it('should create an instance and save to the attached data source',
|
it('should create an instance and save to the attached data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
ClientModel.create({first: 'Joe', last: 'Bob'}, function(err, user) {
|
ClientModel.create({first: 'Joe', last: 'Bob'}, function(err, user) {
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert(user instanceof ClientModel);
|
assert(user instanceof ClientModel);
|
||||||
done();
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('model.save([options], [callback])', function() {
|
describe('model.save([options], [callback])', function() {
|
||||||
it('should save an instance of a Model to the attached data source',
|
it('should save an instance of a Model to the attached data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
const joe = new ClientModel({first: 'Joe', last: 'Bob'});
|
const joe = new ClientModel({first: 'Joe', last: 'Bob'});
|
||||||
joe.save(function(err, user) {
|
joe.save(function(err, user) {
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert(user.id);
|
assert(user.id);
|
||||||
assert(!user.errors);
|
assert(!user.errors);
|
||||||
done();
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('model.updateAttributes(data, [callback])', function() {
|
describe('model.updateAttributes(data, [callback])', function() {
|
||||||
it('should save specified attributes to the attached data source',
|
it('should save specified attributes to the attached data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
ServerModel.create({first: 'joe', age: 100}, function(err, user) {
|
ServerModel.create({first: 'joe', age: 100}, function(err, user) {
|
||||||
if (err) return done(err);
|
|
||||||
assert.equal(user.first, 'joe');
|
|
||||||
|
|
||||||
user.updateAttributes({
|
|
||||||
first: 'updatedFirst',
|
|
||||||
last: 'updatedLast'
|
|
||||||
}, function(err, updatedUser) {
|
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert.equal(updatedUser.first, 'updatedFirst');
|
assert.equal(user.first, 'joe');
|
||||||
assert.equal(updatedUser.last, 'updatedLast');
|
|
||||||
assert.equal(updatedUser.age, 100);
|
user.updateAttributes({
|
||||||
done();
|
first: 'updatedFirst',
|
||||||
|
last: 'updatedLast',
|
||||||
|
}, function(err, updatedUser) {
|
||||||
|
if (err) return done(err);
|
||||||
|
assert.equal(updatedUser.first, 'updatedFirst');
|
||||||
|
assert.equal(updatedUser.last, 'updatedLast');
|
||||||
|
assert.equal(updatedUser.age, 100);
|
||||||
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Model.upsert(data, callback)', function() {
|
describe('Model.upsert(data, callback)', function() {
|
||||||
it('should update when a record with id=data.id is found, insert otherwise',
|
it('should update when a record with id=data.id is found, insert otherwise',
|
||||||
function(done) {
|
function(done) {
|
||||||
ClientModel.upsert({first: 'joe', id: 7}, function(err, user) {
|
ClientModel.upsert({first: 'joe', id: 7}, function(err, user) {
|
||||||
if (err) return done(err);
|
|
||||||
assert.equal(user.first, 'joe');
|
|
||||||
|
|
||||||
ClientModel.upsert({first: 'bob', id: 7}, function(err,
|
|
||||||
updatedUser) {
|
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert.equal(updatedUser.first, 'bob');
|
assert.equal(user.first, 'joe');
|
||||||
done();
|
|
||||||
|
ClientModel.upsert({first: 'bob', id: 7}, function(err,
|
||||||
|
updatedUser) {
|
||||||
|
if (err) return done(err);
|
||||||
|
assert.equal(updatedUser.first, 'bob');
|
||||||
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Model.deleteById(id, [callback])', function() {
|
describe('Model.deleteById(id, [callback])', function() {
|
||||||
it('should delete a model instance from the attached data source',
|
it('should delete a model instance from the attached data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
ServerModel.create({first: 'joe', last: 'bob'}, function(err, user) {
|
ServerModel.create({first: 'joe', last: 'bob'}, function(err, user) {
|
||||||
if (err) return done(err);
|
|
||||||
ClientModel.deleteById(user.id, function(err) {
|
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
ClientModel.findById(user.id, function(err, notFound) {
|
ClientModel.deleteById(user.id, function(err) {
|
||||||
assert.equal(notFound, null);
|
if (err) return done(err);
|
||||||
assert(err && err.statusCode === 404,
|
ClientModel.findById(user.id, function(err, notFound) {
|
||||||
'should have failed with HTTP 404');
|
assert.equal(notFound, null);
|
||||||
done();
|
assert(err && err.statusCode === 404,
|
||||||
|
'should have failed with HTTP 404');
|
||||||
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Model.findById(id, callback)', function() {
|
describe('Model.findById(id, callback)', function() {
|
||||||
it('should find an instance by id from the attached data source',
|
it('should find an instance by id from the attached data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
ServerModel.create({first: 'michael', last: 'jordan', id: 23},
|
ServerModel.create({first: 'michael', last: 'jordan', id: 23},
|
||||||
function(err) {
|
function(err) {
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
ClientModel.findById(23, function(err, user) {
|
ClientModel.findById(23, function(err, user) {
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert.equal(user.id, 23);
|
assert.equal(user.id, 23);
|
||||||
assert.equal(user.first, 'michael');
|
assert.equal(user.first, 'michael');
|
||||||
assert.equal(user.last, 'jordan');
|
assert.equal(user.last, 'jordan');
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Model.count([query], callback)', function() {
|
describe('Model.count([query], callback)', function() {
|
||||||
it('should return the count of Model instances from both data source',
|
it('should return the count of Model instances from both data source',
|
||||||
function(done) {
|
function(done) {
|
||||||
const taskEmitter = new TaskEmitter();
|
const taskEmitter = new TaskEmitter();
|
||||||
taskEmitter
|
taskEmitter
|
||||||
.task(ServerModel, 'create', {first: 'jill', age: 100})
|
.task(ServerModel, 'create', {first: 'jill', age: 100})
|
||||||
.task(ClientModel, 'create', {first: 'bob', age: 200})
|
.task(ClientModel, 'create', {first: 'bob', age: 200})
|
||||||
.task(ClientModel, 'create', {first: 'jan'})
|
.task(ClientModel, 'create', {first: 'jan'})
|
||||||
.task(ServerModel, 'create', {first: 'sam'})
|
.task(ServerModel, 'create', {first: 'sam'})
|
||||||
.task(ServerModel, 'create', {first: 'suzy'})
|
.task(ServerModel, 'create', {first: 'suzy'})
|
||||||
.on('done', function(err) {
|
.on('done', function(err) {
|
||||||
if (err) return done(err);
|
|
||||||
ClientModel.count({age: {gt: 99}}, function(err, count) {
|
|
||||||
if (err) return done(err);
|
if (err) return done(err);
|
||||||
assert.equal(count, 2);
|
ClientModel.count({age: {gt: 99}}, function(err, count) {
|
||||||
done();
|
if (err) return done(err);
|
||||||
|
assert.equal(count, 2);
|
||||||
|
done();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue