Merge pull request #67 from chentsulin/update-lint-test-deps

updated dependencies for lint and test

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
 node_js:
-  - '6.3.1'
+  - '10'
+  - '8'
+  - '6'
 after_script:
   - npm install -g codeclimate-test-reporter
   - CODECLIMATE_REPO_TOKEN=be81a850806bfaf0ea98cbd38daef658481d1bbcf04886de925b8c043eb0c20e codeclimate < ./coverage/lcov.info

lib/index.js

@@ -22,8 +22,8 @@ module.exports = function modelBase (bookshelf, params) {
         }
 
         this.validate = this.validate.isJoi
-           ? this.validate.keys(baseValidation)
-           : Joi.object(this.validate).keys(baseValidation)
+          ? this.validate.keys(baseValidation)
+          : Joi.object(this.validate).keys(baseValidation)
 
         this.on('saving', this.validateSave)
       }
@@ -104,7 +104,7 @@ module.exports = function modelBase (bookshelf, params) {
      */
     create: function (data, options) {
       return this.forge(data)
-      .save(null, options)
+        .save(null, options)
     },
 
     /**
@@ -119,9 +119,9 @@ module.exports = function modelBase (bookshelf, params) {
     update: function (data, options) {
       options = extend({ patch: true, require: true }, options)
       return this.forge({ [this.prototype.idAttribute]: options.id }).fetch(options)
-      .then(function (model) {
-        return model ? model.save(data, options) : undefined
-      })
+        .then(function (model) {
+          return model ? model.save(data, options) : undefined
+        })
     },
 
     /**
@@ -134,7 +134,7 @@ module.exports = function modelBase (bookshelf, params) {
     destroy: function (options) {
       options = extend({ require: true }, options)
       return this.forge({ [this.prototype.idAttribute]: options.id })
-      .destroy(options)
+        .destroy(options)
     },
 
     /**
@@ -146,11 +146,11 @@ module.exports = function modelBase (bookshelf, params) {
       */
     findOrCreate: function (data, options) {
       return this.findOne(data, extend(options, { require: false }))
-      .bind(this)
-      .then(function (model) {
-        var defaults = options && options.defaults
-        return model || this.create(extend(defaults, data), options)
-      })
+        .bind(this)
+        .then(function (model) {
+          var defaults = options && options.defaults
+          return model || this.create(extend(defaults, data), options)
+        })
     },
 
     /**
@@ -161,18 +161,18 @@ module.exports = function modelBase (bookshelf, params) {
      */
     upsert: function (selectData, updateData, options) {
       return this.findOne(selectData, extend(options, { require: false }))
-      .bind(this)
-      .then(function (model) {
-        return model
-          ? model.save(
-            updateData,
-            extend({ patch: true, method: 'update' }, options)
-          )
-          : this.create(
-            extend(selectData, updateData),
-            extend(options, { method: 'insert' })
-          )
-      })
+        .bind(this)
+        .then(function (model) {
+          return model
+            ? model.save(
+              updateData,
+              extend({ patch: true, method: 'update' }, options)
+            )
+            : this.create(
+              extend(selectData, updateData),
+              extend(options, { method: 'insert' })
+            )
+        })
     }
   })
 

package.json

@@ -25,11 +25,11 @@
     "bluebird": "^3.4.1",
     "bookshelf": "^0.10.0",
     "knex": "^0.11.9",
-    "chai": "^3.5.0",
+    "chai": "^4.2.0",
     "istanbul": "^0.4.4",
-    "mocha": "^3.0.0",
-    "sinon": "^1.17.5",
-    "sqlite3": "^3.1.4",
-    "standard": "^7.1.2"
+    "mocha": "^5.2.0",
+    "sinon": "^6.3.4",
+    "sqlite3": "^4.0.2",
+    "standard": "^12.0.1"
   }
 }