Skip to content

Commit

Permalink
run shared tests from both v3 and v4 of juggler
Browse files Browse the repository at this point in the history
  • Loading branch information
nabdelgadir committed Jul 12, 2019
1 parent 36df829 commit e5dcf8f
Show file tree
Hide file tree
Showing 8 changed files with 81 additions and 18 deletions.
1 change: 1 addition & 0 deletions .eslintignore
@@ -0,0 +1 @@
**/node_modules/
8 changes: 8 additions & 0 deletions deps/juggler-v3/package.json
@@ -0,0 +1,8 @@
{
"name": "juggler-v3",
"version": "3.0.0",
"dependencies": {
"loopback-datasource-juggler":"3.x",
"should": "^13.2.3"
}
}
24 changes: 24 additions & 0 deletions deps/juggler-v3/test.js
@@ -0,0 +1,24 @@
// Copyright IBM Corp. 2019. All Rights Reserved.
// Node module: loopback-connector-mssql
// This file is licensed under the MIT License.
// License text available at https://opensource.org/licenses/MIT

'use strict';

const juggler = require('loopback-datasource-juggler');
const name = require('./package.json').name;

require('../../test/init');

describe(name, function() {
before(function() {
return global.resetDataSourceClass(juggler.DataSource);
});

after(function() {
return global.resetDataSourceClass();
});

require('loopback-datasource-juggler/test/common.batch.js');
require('loopback-datasource-juggler/test/include.test.js');
});
8 changes: 8 additions & 0 deletions 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"
}
}
24 changes: 24 additions & 0 deletions deps/juggler-v4/test.js
@@ -0,0 +1,24 @@
// Copyright IBM Corp. 2019. All Rights Reserved.
// Node module: loopback-connector-mssql
// This file is licensed under the MIT License.
// License text available at https://opensource.org/licenses/MIT

'use strict';

const juggler = require('loopback-datasource-juggler');
const name = require('./package.json').name;

require('../../test/init');

describe(name, function() {
before(function() {
return global.resetDataSourceClass(juggler.DataSource);
});

after(function() {
return global.resetDataSourceClass();
});

require('loopback-datasource-juggler/test/common.batch.js');
require('loopback-datasource-juggler/test/include.test.js');
});
6 changes: 4 additions & 2 deletions package.json
Expand Up @@ -30,7 +30,9 @@
"bluebird": "^3.5.1",
"eslint": "^5.2.0",
"eslint-config-loopback": "^11.0.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",
"rc": "^1.0.0",
"should": "^13.2.1",
Expand All @@ -39,7 +41,7 @@
"scripts": {
"lint": "eslint .",
"pretest": "node pretest.js",
"test": "mocha",
"test": "mocha test/*.test.js node_modules/juggler-v3/test.js node_modules/juggler-v4/test.js",
"posttest": "npm run lint",
"prepublish": "node remove-regenerator.js"
},
Expand Down
14 changes: 0 additions & 14 deletions test/imported.test.js

This file was deleted.

14 changes: 12 additions & 2 deletions test/init.js
Expand Up @@ -6,7 +6,8 @@
'use strict';
module.exports = require('should');

var DataSource = require('loopback-datasource-juggler').DataSource;
const juggler = require('loopback-datasource-juggler');
const DataSource = juggler.DataSource;

var config = {};
try {
Expand Down Expand Up @@ -44,12 +45,21 @@ global.getConfig = function(options) {
return dbConf;
};

let db;

global.getDataSource = global.getSchema = function(options) {
/* global getConfig */
var db = new DataSource(require('../'), getConfig(options));
db = new DataSource(require('../'), getConfig(options));
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,
Expand Down

0 comments on commit e5dcf8f

Please sign in to comment.