Cleanup

index.js

@@ -1,20 +1,22 @@
-exports.Connector = require('./lib/connector');
+Object.defineProperties(exports, {
+  test: {
+    get: function() {
+      return require('./test/common');
+    }
+  },
+  version: {
+    value: require('./package.json').version
+  }
+});
+
+exports.Connector = require('./lib/connectors/base');
 // Set up SqlConnector as an alias to SQLConnector
 exports.SQLConnector = exports.SqlConnector = require('./lib/sql');
 exports.ParameterizedSQL = exports.SQLConnector.ParameterizedSQL;
 exports.Transaction = require('./lib/transaction');
 
 exports.ModelBuilder = exports.LDL = require('loopback-model/lib/model-builder');
-exports.DataSource = exports.Schema = require('./lib/datasource.js').DataSource;
+exports.DataSource = exports.Schema = require('./lib/datasource').DataSource;
 exports.ModelBaseClass = require('loopback-model/lib/model');
 exports.GeoPoint = require('loopback-model').Geo.GeoPoint;
 exports.ValidationError = require('loopback-model/lib/validations').ValidationError;
-
-Object.defineProperty(exports, 'version', {
-  get: function() {return require('./package.json').version;}
-});
-
-var commonTest = './test/common_test';
-Object.defineProperty(exports, 'test', {
-  get: function() {return require(commonTest);}
-});

lib/datasource.js

@@ -1,7 +1,7 @@
 /*!
  * Module dependencies
  */
-var ModelBuilder = require('loopback-model/lib/model-builder.js').ModelBuilder;
+var ModelBuilder = require('loopback-model/lib/model-builder').ModelBuilder;
 var ModelDefinition = require('loopback-model/lib/model-definition');
 var RelationDefinition = require('loopback-model-persistence/lib/relation-definition');
 var OberserverMixin = require('loopback-model/lib/observer');

lib/sql.js

@@ -1,7 +1,7 @@
 var util = require('util');
 var async = require('async');
 var assert = require('assert');
-var Connector = require('./connector');
+var Connector = require('./connectors/base');
 var debug = require('debug')('loopback:connector:sql');
 var ParameterizedSQL = require('./parameterized-sql');
 var Transaction = require('./transaction');

package.json

@@ -21,8 +21,7 @@
   },
   "scripts": {
     "lint": "eslint .",
-    "test": "mocha",
-      "posttest": "npm run lint"
+    "test": "mocha -r test/configs"
   },
   "repository": {
     "type": "git",

test/automigrate.js

@@ -1,6 +1,5 @@
 var DataSource = require('..').DataSource;
-var expect = require('chai').expect;
-var testConnector = require('./connectors/test-sql-connector');
+var testConnector = require('./mocks/sql-connector');
 
 var ds = new DataSource({
   connector: testConnector,

test/common.js

@@ -1,4 +1,4 @@
-var Schema = require('../index').Schema;
+var Schema = require('..').Schema;
 var Text = Schema.Text;
 
 var nbSchemaRequests = 0;

test/configs/index.js

@@ -0,0 +1,36 @@
+var chai = require('chai');
+var ModelBuilder = require('loopback-model/lib/model-builder').ModelBuilder;
+var Schema = require('../..').Schema;
+var should = require('should');
+
+/*
+if (!process.env.TRAVIS) {
+  if (typeof __cov === 'undefined') {
+    process.on('exit', function() {
+      require('semicov').report();
+    });
+  }
+
+  require('semicov').init('lib');
+}
+*/
+
+Object.defineProperties(global, {
+  getModelBuilder: {
+    value: function() {
+      return new ModelBuilder();
+    }
+  },
+  getSchema: {
+    value: function(connector, settings) {
+      connector = connector || 'memory';
+      return new Schema(connector, settings);
+    }
+  },
+  expect: {
+    value: chai.expect
+  },
+  should: {
+    value: should
+  }
+});

test/custom-type-foreign-key.js

@@ -1,7 +1,4 @@
-var should = require('./init.js');
-
-var jdb = require('../');
-var DataSource = jdb.DataSource;
+var DataSource = require('..').DataSource;
 
 var ds, Item, Variant;
 describe('Datasource-specific field types for foreign keys', function () {

test/datasource.js

@@ -1,6 +1,3 @@
-// This test written in mocha+should.js
-var should = require('./init.js');
-
 var db = getSchema(), slave = getSchema(), Model, SlaveModel;
 
 describe('dataSource', function () {

test/defaults.js

@@ -1,6 +1,3 @@
-// This test written in mocha+should.js
-var should = require('./init.js');
-
 var db = getSchema();
 
 describe('defaults', function () {

test/discovery.js

@@ -1,6 +1,5 @@
 var jdb = require('../');
 var DataSource = jdb.DataSource;
-var should = require('./init.js');
 
 describe('Memory connector with mocked discovery', function() {
   var ds;

test/index.js

@@ -0,0 +1,8 @@
+var main = require('..');
+var pkgJson = require('../package.json');
+
+describe('main', function() {
+  it('should expose a version number', function() {
+    main.version.should.equal(pkgJson.version);
+  });
+});

test/init.js

@@ -1,28 +0,0 @@
-module.exports = require('should');
-
-/*
- if (!process.env.TRAVIS) {
- if (typeof __cov === 'undefined') {
- process.on('exit', function () {
- require('semicov').report();
- });
- }
-
- require('semicov').init('lib');
- }
- */
-
-var ModelBuilder = require('loopback-model/lib/model-builder').ModelBuilder;
-var Schema = require('../').Schema;
-
-if (!('getSchema' in global)) {
-  global.getSchema = function (connector, settings) {
-    return new Schema(connector || 'memory', settings);
-  };
-}
-
-if (!('getModelBuilder' in global)) {
-  global.getModelBuilder = function () {
-    return new ModelBuilder();
-  };
-}

test/juggler.js

@@ -1,9 +0,0 @@
-var metadata = require('../package.json');
-var project = require('..');
-var should = require('./init.js');
-
-describe('juggler', function() {
-  it('should expose a version number', function() {
-    project.version.should.equal(metadata.version);
-  });
-});

test/memory.js

@@ -4,11 +4,10 @@ var path = require('path');
 var fs = require('fs');
 var assert = require('assert');
 var async = require('async');
-var should = require('./init.js');
 var Memory = require('../lib/connectors/memory').Memory;
 
 describe('Memory connector', function() {
-  var file = path.join(__dirname, 'memory.json');
+  var file = path.join(__dirname, '/fixtures/memory.json');
 
   function readModels(done) {
     fs.readFile(file, function(err, data) {

test/sql.js

@@ -1,8 +1,7 @@
 var DataSource = require('..').DataSource;
-var expect = require('chai').expect;
 var SQLConnector = require('../lib/sql');
 var ParameterizedSQL = SQLConnector.ParameterizedSQL;
-var testConnector = require('./connectors/test-sql-connector');
+var testConnector = require('./mocks/sql-connector');
 
 var ds = new DataSource({
   connector: testConnector,

test/transaction.js

@@ -1,6 +1,5 @@
 var DataSource = require('..').DataSource;
-var expect = require('chai').expect;
-var testConnector = require('./connectors/test-sql-connector');
+var testConnector = require('./mocks/sql-connector');
 var Transaction = require('../index').Transaction;
 
 var db;

test/transient.js

@@ -1,5 +1,4 @@
 var DataSource = require('..').DataSource;
-var should = require('./init.js');
 
 describe('connectors.transient', function() {
   var db;