Labrc Tests 0.14

.labrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  globals: '__BluebirdErrorTypes__,Set,Intl,Map,__core-js_shared__,System,Observable,regeneratorRuntime,asap,core,_babelPolyfill,WebAssembly',
+  verbose: true,
+}

Makefile

@@ -1,7 +1,7 @@
 ESLINT = node_modules/.bin/eslint
 LAB = ./node_modules/lab/bin/lab
 BABEL = ./node_modules/.bin/babel
-KNEX_VERSIONS = 0.8 0.9 0.10 0.11 0.12 0.13
+KNEX_VERSIONS = 0.8 0.9 0.10 0.11 0.12 0.13 0.14
 
 .PHONY: clean test lint lint-quiet watch build test-debug $(KNEX_VERSIONS)
 
@@ -11,7 +11,7 @@ clean:
 	-rm -rf ./dist
 
 test:
-	${LAB} -v -I __BluebirdErrorTypes__,Set,Intl,Map,__core-js_shared__,System,Observable,regeneratorRuntime,asap,core,_babelPolyfill ./test/init.js
+	${LAB} ./test/init.js
 
 test-suite: $(KNEX_VERSIONS)
 
@@ -20,7 +20,7 @@ $(KNEX_VERSIONS):
 	make test
 
 debug:
-	BLUEBIRD_DEBUG=1 DEBUG=pool2 node-debug -p 8888 ${LAB} -m 0 -v -I __BluebirdErrorTypes__,Set,Intl,Map,__core-js_shared__,System,Observable,regeneratorRuntime,asap,core,_babelPolyfill ./test/init.js
+	BLUEBIRD_DEBUG=1 DEBUG=pool2 node-debug -p 8888 ${LAB} -m 0 ./test/init.js
 
 lint:
 	$(ESLINT) --ext .js --ext .jsx .

dist/platforms/knex/0.14/index.js

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _index = require('../0.12/index');
+
+var _index2 = _interopRequireDefault(_index);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.default = _index2.default;

dist/platforms/knex/0.8/index.js

@@ -115,10 +115,10 @@ var spec = exports.spec = {
   define: defineConnection(connection)
 };
 
-function makeClient(spec) {
+function makeClient(def) {
   return {
     mock: function mock(db) {
-      return _transformer2.default.transform(db, spec);
+      return _transformer2.default.transform(db, def);
     },
     unmock: function unmock(db) {
       return _transformer2.default.restore(db);

package.json

@@ -39,7 +39,7 @@
     "sqlite3": "^3.0.8"
   },
   "peerDependencies": {
-    "knex": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0  || ^0.13.0"
+    "knex": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0  || ^0.13.0 || ^0.14.0"
   },
   "dependencies": {
     "bluebird": "^3.4.1",

src/platforms/knex/0.14/index.js

@@ -0,0 +1,3 @@
+import client from '../0.12/index';
+
+export default client;

src/platforms/knex/0.8/index.js

@@ -87,10 +87,10 @@ export let spec = {
   define : defineConnection(connection),
 };
 
-export function makeClient(spec) {
+export function makeClient(def) {
   return {
     mock(db) {
-      return transformer.transform(db, spec);
+      return transformer.transform(db, def);
     },
 
     unmock(db) {

test/common/bookshelf.js

@@ -143,11 +143,11 @@ export default (db) => {
 
       it('should work with Model#count', (done) => {
         tracker.on('query', (query) => {
-          try {
-            expect(query.sql).to.equal('select count("count") as "count" from "models" where "color" = ?');
-          } catch (e) {
-            expect(query.sql).to.equal('select count(`count`) as `count` from `models` where `color` = ?');
-          }
+          expect([
+            'select count("count") as "count" from "models" where "color" = $1',
+            'select count("count") as "count" from "models" where "color" = ?',
+            'select count(`count`) as `count` from `models` where `color` = ?',
+          ]).to.contain(query.sql);
 
           expect(query.method).to.equal('select');
 

test/mysql/knex.js

@@ -15,7 +15,11 @@ export default (db) => {
   it('should support schema#hasTable', (done) => {
     tracker.on('query', (query) => {
       expect(query.sql).to.be.a('string');
-      expect(query.sql).to.equal('show tables like ?');
+
+      expect([
+        'show tables like ?',
+        'select * from information_schema.tables where table_name = ? and table_schema = database()',
+      ]).to.contain(query.sql);
 
       done();
     });

test/postgres/knex.js

@@ -15,11 +15,12 @@ export default (db) => {
   it('should support schema#hasTable', (done) => {
     tracker.on('query', (query) => {
       expect(query.sql).to.be.a('string');
-      try {
-        expect(query.sql).to.equal('select * from information_schema.tables where table_name = ? and table_schema = current_schema');
-      } catch (e) {
-        expect(query.sql).to.equal('select * from information_schema.tables where table_name = ?');
-      }
+
+      expect([
+        'select * from information_schema.tables where table_name = ? and table_schema = current_schema',
+        'select * from information_schema.tables where table_name = ?',
+        'select * from information_schema.tables where table_name = $1 and table_schema = current_schema',
+      ]).to.contain(query.sql);
 
       done();
     });