From 5a7d0b9934e35064ae8d3598b68fbdfef40bd340 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Wed, 20 Jul 2016 16:32:32 -0400 Subject: [PATCH] Fix setup for gitlab ci --- test/adapters/mysql2_test.js | 9 +++++++-- test/adapters/pg_test.js | 8 ++++++++ test/docker_install.sh | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/test/adapters/mysql2_test.js b/test/adapters/mysql2_test.js index c325be1..63367db 100644 --- a/test/adapters/mysql2_test.js +++ b/test/adapters/mysql2_test.js @@ -17,8 +17,13 @@ let nodeQuery = reload('../../lib/NodeQuery')(config); let qb = nodeQuery.getQuery(); suite('Mysql2 adapter tests -', () => { - - suiteSetup(done => qb.truncate('create_test').then(() => done())); + suiteSetup(done => { + qb.truncate('create_join').then(() => { + qb.truncate('create_test').then(() => { + done(); + }); + }); + }); test('nodeQuery.getQuery = nodeQuery.init', () => { expect(nodeQuery.getQuery()) diff --git a/test/adapters/pg_test.js b/test/adapters/pg_test.js index c701685..e732091 100644 --- a/test/adapters/pg_test.js +++ b/test/adapters/pg_test.js @@ -19,6 +19,14 @@ let qb = nodeQuery.getQuery(); let qb2 = null; suite('Pg adapter tests -', () => { + suiteSetup(done => { + qb.truncate('create_join').then(() => { + qb.truncate('create_test').then(() => { + done(); + }); + }); + }); + test('nodeQuery.getQuery = nodeQuery.init', () => { expect(nodeQuery.getQuery()) .to.be.deep.equal(qb); diff --git a/test/docker_install.sh b/test/docker_install.sh index 91534d5..9c54179 100644 --- a/test/docker_install.sh +++ b/test/docker_install.sh @@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" set -xe # Replace test config with docker config file -mv "$DIR/config-ci.json $DIR/config.json" \ No newline at end of file +mv "$DIR/config-ci.json" "$DIR/config.json" \ No newline at end of file