Updated to the latest versions.

jtwebman · Sep 7, 2018 · 1105bf9 · 1105bf9
1 parent 51669a7
commit 1105bf9
Show file tree

Hide file tree

Showing 8 changed files with 2,618 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,18 +1,18 @@
 {
   "name": "bookshelf-scopes",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Giving you Rails like scopes in Bookshelf.js.",
   "main": "src/scopes.js",
   "dependencies": {
-    "lodash": "^3.10.1"
+    "lodash": "^4.17.10"
   },
   "devDependencies": {
-    "bluebird": "^2.11.0",
-    "bookshelf": "^0.8.2",
-    "chai": "^2.3.0",
-    "knex": "^0.8.6",
-    "mocha": "^2.5.3",
-    "sqlite3": "^3.1.8"
+    "bluebird": "^3.5.2",
+    "bookshelf": "^0.13.3",
+    "chai": "^4.1.2",
+    "knex": "^0.15.2",
+    "mocha": "^5.2.0",
+    "sqlite3": "^4.0.2"
   },
   "scripts": {
     "test": "mocha"

diff --git a/test/scopes_basic.js b/test/scopes_basic.js
@@ -5,7 +5,8 @@ var Promise = require('bluebird');
 
 var knex = require('knex')({
   client: 'sqlite3',
-  connection: { filename: "./mytestdb" }
+  connection: { filename: "./mytestdb" },
+  useNullAsDefault: true
 });
 
 var bookshelf = require('bookshelf')(knex);
@@ -28,6 +29,10 @@ describe('scopes - basic scope', function() {
     });
   });
 
+  after(function(done) {
+    knex.destroy(done);
+  });
+
   it('can add simple scope method with a where and fetchAll from db', function() {
 
     var TestModel1 = bookshelf.Model.extend({

diff --git a/test/scopes_collection.js b/test/scopes_collection.js
@@ -5,7 +5,8 @@ var Promise = require('bluebird');
 
 var knex = require('knex')({
   client: 'sqlite3',
-  connection: { filename: "./mytestdb" }
+  connection: { filename: "./mytestdb" },
+  useNullAsDefault: true
 });
 
 var bookshelf = require('bookshelf')(knex);
@@ -33,6 +34,10 @@ describe('scopes - collection', function() {
     });
   });
 
+  after(function(done) {
+    knex.destroy(done);
+  });
+
   it('can add simple scope method with a where and fetch from db', function() {
 
     var TestModel1 = bookshelf.Model.extend({
@@ -49,7 +54,7 @@ describe('scopes - collection', function() {
     });
 
     expect(TestCollection1.active).to.not.be.undefined;
-    
+
     return TestCollection1.active().fetch().then(function(allActive) {
       expect(allActive.length).to.equal(2);
       expect(allActive.models[0].get('status')).to.equal('Active');

diff --git a/test/scopes_default.js b/test/scopes_default.js
@@ -5,7 +5,8 @@ var Promise = require('bluebird');
 
 var knex = require('knex')({
   client: 'sqlite3',
-  connection: { filename: "./mytestdb" }
+  connection: { filename: "./mytestdb" },
+  useNullAsDefault: true
 });
 
 var bookshelf = require('bookshelf')(knex);
@@ -28,6 +29,10 @@ describe('scopes - default', function() {
     });
   });
 
+  after(function(done) {
+    knex.destroy(done);
+  });
+
   it('can set default scope and fetchAll using it', function() {
     var TestModel1 = bookshelf.Model.extend({
       tableName: 'testmodel',

diff --git a/test/scopes_inherit.js b/test/scopes_inherit.js
@@ -5,7 +5,8 @@ var Promise = require('bluebird');
 
 var knex = require('knex')({
   client: 'sqlite3',
-  connection: { filename: "./mytestdb" }
+  connection: { filename: "./mytestdb" },
+  useNullAsDefault: true
 });
 
 var bookshelf = require('bookshelf')(knex);
@@ -28,6 +29,10 @@ describe('scopes - inherited scope', function() {
     });
   });
 
+  after(function(done) {
+    knex.destroy(done);
+  });
+
   it('can add simple scope method with a where and fetchAll from db', function() {
     var TestModelBase = bookshelf.Model.extend({
       scopes: {

diff --git a/test/scopes_joining.js b/test/scopes_joining.js
@@ -5,7 +5,8 @@ var Promise = require('bluebird');
 
 var knex = require('knex')({
   client: 'sqlite3',
-  connection: { filename: "./mytestdb" }
+  connection: { filename: "./mytestdb" },
+  useNullAsDefault: true
 });
 
 var bookshelf = require('bookshelf')(knex);
@@ -41,6 +42,10 @@ describe('scopes - joining scope', function() {
     ]);
   });
 
+  after(function(done) {
+    knex.destroy(done);
+  });
+
   it('can add scope with a basic joining where and fetchAll from db', function() {
 
     var TestModel1 = bookshelf.Model.extend({

diff --git a/test/scopes_related.js b/test/scopes_related.js
@@ -5,7 +5,8 @@ var Promise = require('bluebird');
 
 var knex = require('knex')({
   client: 'sqlite3',
-  connection: { filename: "./mytestdb" }
+  connection: { filename: "./mytestdb" },
+  useNullAsDefault: true
 });
 
 var bookshelf = require('bookshelf')(knex);
@@ -53,6 +54,10 @@ describe('scopes - related scope', function() {
     ]);
   });
 
+  after(function(done) {
+    knex.destroy(done);
+  });
+
   it('default scope is on related data fetch', function() {
 
     var TestModel1 = bookshelf.Model.extend({