Fix setup for gitlab ci

This commit is contained in:
Timothy Warren 2016-07-20 16:32:32 -04:00
parent 961a026868
commit 5a7d0b9934
3 changed files with 16 additions and 3 deletions

View File

@ -17,8 +17,13 @@ let nodeQuery = reload('../../lib/NodeQuery')(config);
let qb = nodeQuery.getQuery(); let qb = nodeQuery.getQuery();
suite('Mysql2 adapter tests -', () => { suite('Mysql2 adapter tests -', () => {
suiteSetup(done => {
suiteSetup(done => qb.truncate('create_test').then(() => done())); qb.truncate('create_join').then(() => {
qb.truncate('create_test').then(() => {
done();
});
});
});
test('nodeQuery.getQuery = nodeQuery.init', () => { test('nodeQuery.getQuery = nodeQuery.init', () => {
expect(nodeQuery.getQuery()) expect(nodeQuery.getQuery())

View File

@ -19,6 +19,14 @@ let qb = nodeQuery.getQuery();
let qb2 = null; let qb2 = null;
suite('Pg adapter tests -', () => { suite('Pg adapter tests -', () => {
suiteSetup(done => {
qb.truncate('create_join').then(() => {
qb.truncate('create_test').then(() => {
done();
});
});
});
test('nodeQuery.getQuery = nodeQuery.init', () => { test('nodeQuery.getQuery = nodeQuery.init', () => {
expect(nodeQuery.getQuery()) expect(nodeQuery.getQuery())
.to.be.deep.equal(qb); .to.be.deep.equal(qb);

View File

@ -9,4 +9,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
set -xe set -xe
# Replace test config with docker config file # Replace test config with docker config file
mv "$DIR/config-ci.json $DIR/config.json" mv "$DIR/config-ci.json" "$DIR/config.json"