Merge pull request #43 from strongloop/build/test-juggler-v3-and-v4

Run shared tests from both v3 and v4 of juggler

Author: bajtos

.eslintignore

@@ -1 +1,2 @@
 coverage/
+**/node_modules/

.gitignore

@@ -14,3 +14,4 @@
 *.tgz
 node_modules
 checkstyle.xml
+**/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,33 @@
+// Copyright IBM Corp. 2019. All Rights Reserved.
+// Node module: loopback-connector-postgresql
+// This file is licensed under the Artistic License 2.0.
+// License text available at https://opensource.org/licenses/Artistic-2.0
+
+'use strict';
+
+const createDataSource = require('../../test/helpers/data-source-factory');
+const kvaoTestSuite = require('loopback-datasource-juggler/test/kvao.suite.js');
+const juggler = require('loopback-datasource-juggler');
+const name = require('./package.json').name;
+
+describe(name, function() {
+ before(function() {
+ return createDataSource.resetDataSourceClass(juggler.DataSource);
+ });
+
+ after(function() {
+ return createDataSource.resetDataSourceClass();
+ });
+
+ context('using binary packer', function() {
+ kvaoTestSuite(createDataSource);
+ });
+
+ context('using json-string packer', function() {
+ kvaoTestSuite(createDataSource.json);
+ });
+
+ context('using json-string packer with hex buffers', function() {
+ kvaoTestSuite(createDataSource.jsonWithHexBuffers);
+ });
+});

deps/juggler-v4/package.json

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

deps/juggler-v4/test.js

@@ -0,0 +1,33 @@
+// Copyright IBM Corp. 2019. All Rights Reserved.
+// Node module: loopback-connector-postgresql
+// This file is licensed under the Artistic License 2.0.
+// License text available at https://opensource.org/licenses/Artistic-2.0
+
+'use strict';
+
+const createDataSource = require('../../test/helpers/data-source-factory');
+const kvaoTestSuite = require('loopback-datasource-juggler/test/kvao.suite.js');
+const juggler = require('loopback-datasource-juggler');
+const name = require('./package.json').name;
+
+describe(name, function() {
+ before(function() {
+ return createDataSource.resetDataSourceClass(juggler.DataSource);
+ });
+
+ after(function() {
+ return createDataSource.resetDataSourceClass();
+ });
+
+ context('using binary packer', function() {
+ kvaoTestSuite(createDataSource);
+ });
+
+ context('using json-string packer', function() {
+ kvaoTestSuite(createDataSource.json);
+ });
+
+ context('using json-string packer with hex buffers', function() {
+ kvaoTestSuite(createDataSource.jsonWithHexBuffers);
+ });
+});

package.json

@@ -18,7 +18,7 @@
  },
  "main": "lib/kv-redis.js",
  "scripts": {
- "test": "mocha test/integration",
+ "test": "mocha test/integration node_modules/juggler-v3/test.js node_modules/juggler-v4/test.js",
  "posttest": "npm run lint",
  "lint": "eslint ."
  },
@@ -36,6 +36,8 @@
  "dirty-chai": "^2.0.1",
  "eslint": "^4.19.1",
  "eslint-config-loopback": "^10.0.0",
+ "juggler-v3": "file:./deps/juggler-v3",
+ "juggler-v4": "file:./deps/juggler-v4",
  "loopback-datasource-juggler": "^3.0.0",
  "mocha": "^5.2.0",
  "should": "^8.4.0"

test/helpers/data-source-factory.js

@@ -5,8 +5,9 @@
 
 'use strict';
 
-const DataSource = require('loopback-datasource-juggler').DataSource;
 const connector = require('../..');
+const juggler = require('loopback-datasource-juggler');
+let DataSource = juggler.DataSource;
 
 const SETTINGS = {
  host: process.env.REDIS_HOST || 'localhost',
@@ -62,6 +63,10 @@ createDataSource.jsonWithHexBuffers = function(options) {
  return createDataSource(settings);
 };
 
+createDataSource.resetDataSourceClass = function(ctor) {
+ DataSource = ctor || juggler.DataSource;
+};
+
 beforeEach(function clearDatabase(done) {
  const ds = createDataSource();
  ds.connector.execute('FLUSHDB', function(err) {