juggler-v3-v4 shared test

.eslintignore

@@ -0,0 +1 @@
+**/node_modules/

deps/juggler-v3/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "juggler-v3",
+  "version": "3.0.0",
+  "dependencies": {
+    "loopback-datasource-juggler":"3.x",
+    "should": "^8.4.0"
+  }
+}

deps/juggler-v3/test.js

@@ -0,0 +1,31 @@
+// Copyright IBM Corp. 2019. All Rights Reserved.
+// Node module: loopback-connector-cloudant
+// This file is licensed under the Artistic License 2.0.
+// License text available at https://opensource.org/licenses/Artistic-2.0
+
+'use strict';
+
+const juggler = require('loopback-datasource-juggler');
+const name = require('./package.json').name;
+
+require('../../test/init.js');
+
+describe(name, function() {
+  before(function() {
+    global.IMPORTED_TEST = true;
+    return global.resetDataSourceClass(juggler.DataSource);
+  });
+
+  after(function() {
+    global.IMPORTED_TEST = false;
+    return global.resetDataSourceClass();
+  });
+  require('loopback-datasource-juggler/test/include.test.js');
+  require('loopback-datasource-juggler/test/common.batch.js');
+});
+
+/* TODO: run persistence-hooks, default scope test suites too
+  var testHooks = require('loopback-datasource-juggler/test/persistence-hooks.suite.js');
+  var testDefaultScope = require('loopback-datasource-juggler/test/default-scope.test.js');
+  */
+

deps/juggler-v4/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "juggler-v4",
+  "version": "4.0.0",
+  "dependencies": {
+    "loopback-datasource-juggler":"4.x",
+    "should": "^13.2.3"
+  }
+}

deps/juggler-v4/test.js

@@ -0,0 +1,30 @@
+// Copyright IBM Corp. 2019. All Rights Reserved.
+// Node module: loopback-connector-cloudant
+// This file is licensed under the Artistic License 2.0.
+// License text available at https://opensource.org/licenses/Artistic-2.0
+
+'use strict';
+
+const juggler = require('loopback-datasource-juggler');
+const name = require('./package.json').name;
+
+require('../../test/init.js');
+
+describe(name, function() {
+  before(function() {
+    global.IMPORTED_TEST = true;
+    return global.resetDataSourceClass(juggler.DataSource);
+  });
+
+  after(function() {
+    global.IMPORTED_TEST = false;
+    return global.resetDataSourceClass();
+  });
+  require('loopback-datasource-juggler/test/include.test.js');
+  require('loopback-datasource-juggler/test/common.batch.js');
+});
+
+/* TODO: run persistence-hooks, default scope test suites too
+  var testHooks = require('loopback-datasource-juggler/test/persistence-hooks.suite.js');
+  var testDefaultScope = require('loopback-datasource-juggler/test/default-scope.test.js');
+  */

package.json

@@ -36,7 +36,9 @@
     "dockerode": "^2.4.3",
     "eslint": "^5.16.0",
     "eslint-config-loopback": "^13.1.0",
-    "loopback-datasource-juggler": "^3.0.0",
+    "juggler-v3": "file:./deps/juggler-v3",
+    "juggler-v4": "file:./deps/juggler-v4",
+    "loopback-datasource-juggler": "^3.0.0 || ^4.0.0",
     "mocha": "^5.2.0",
     "ms": "^2.0.0",
     "rc": "^1.1.5",

test.js

@@ -37,8 +37,10 @@ async.waterfall([
   setCloudantEnv,
   waitFor('/_all_dbs'),
   createDB('test-db'),
-  run([mochaBin, '--timeout', '40000', '--require', 'strong-mocha-interfaces',
-    '--require', 'test/init.js', '--ui', 'strong-bdd']),
+  run([mochaBin, 'test/*.test.js', 'node_modules/juggler-v3/test.js',
+    'node_modules/juggler-v4/test.js', '--timeout', '40000',
+    '--require', 'strong-mocha-interfaces', '--require', 'test/init.js',
+    '--ui', 'strong-bdd']),
 ], function(testErr) {
   dockerCleanup(function(cleanupErr) {
     if (cleanupErr) {

test/imported.test.js

@@ -5,20 +5,6 @@
 
 'use strict';
 
-describe('cloudant imported features', function() {
-  before(function() {
-    global.IMPORTED_TEST = true;
-  });
-
-  after(function() {
-    global.IMPORTED_TEST = false;
-  });
-
-  require('loopback-datasource-juggler/test/include.test.js');
-  require('loopback-datasource-juggler/test/common.batch.js');
-});
-
-// Run the COUCHDB2 Test Suite.
 require('./init.js');
 
 process.env.COUCHDB2_TEST_SKIP_INIT = true;

test/init.js

@@ -7,7 +7,8 @@
 
 module.exports = require('should');
 
-const DataSource = require('loopback-datasource-juggler').DataSource;
+const juggler = require('loopback-datasource-juggler');
+let DataSource = juggler.DataSource;
 const _ = require('lodash');
 
 const config = {
@@ -40,8 +41,10 @@ if (process.env.LOOPBACK_MOCHA_SKIPS) {
   process.env.LOOPBACK_MOCHA_SKIPS = JSON.stringify(skips);
 }
 
-global.getDataSource = global.getSchema = function(customConfig) {
-  const db = new DataSource(require('../'), customConfig || config);
+let db;
+global.getDataSource = global.getSchema = function(customConfig, customClass) {
+  const ctor = customClass || DataSource;
+  db = new ctor(require('../'), customConfig || config);
   db.log = function(a) {
     console.log(a);
   };
@@ -115,6 +118,13 @@ global.getDataSource = global.getSchema = function(customConfig) {
   return db;
 };
 
+global.resetDataSourceClass = function(ctor) {
+  DataSource = ctor || juggler.DataSource;
+  const promise = db ? db.disconnect() : Promise.resolve();
+  db = undefined;
+  return promise;
+};
+
 global.connectorCapabilities = {
   ilike: false,
   nilike: false,