From ca672dcdc1a1298b93c0a1b792146661f4f2215a Mon Sep 17 00:00:00 2001 From: hirsch88 Date: Wed, 14 Mar 2018 21:30:00 +0100 Subject: [PATCH 1/8] fix e2e test --- test/e2e/api/users.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/api/users.test.ts b/test/e2e/api/users.test.ts index 1290b549..51e4b2e1 100644 --- a/test/e2e/api/users.test.ts +++ b/test/e2e/api/users.test.ts @@ -3,7 +3,7 @@ import * as request from 'supertest'; import { User } from '../../../src/api/models/User'; import { CreateBruce } from '../../../src/database/seeds/CreateBruce'; -import { runSeeder } from '../../../src/lib/seed'; +import { runSeed } from '../../../src/lib/seed'; import { closeDatabase } from '../../utils/database'; import { fakeAuthenticationForUser } from '../utils/auth'; import { BootstrapSettings } from '../utils/bootstrap'; @@ -20,7 +20,7 @@ describe('/api/users', () => { beforeAll(async () => { settings = await prepareServer({ migrate: true }); - bruce = await runSeeder(CreateBruce); + bruce = await runSeed(CreateBruce); fakeAuthenticationForUser(bruce, true); }); From e3a797ce697d65a472c437e50aad878022883bdb Mon Sep 17 00:00:00 2001 From: hirsch88 Date: Wed, 14 Mar 2018 21:33:20 +0100 Subject: [PATCH 2/8] add all test to travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index c79b4af4..df3a0a2e 100755 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ install: - yarn install scripts: - npm test + - npm test.integration + - npm test.e2e - npm start build notifications: email: false From 9f9cd15913149e44d937856a0a1696267d6a210b Mon Sep 17 00:00:00 2001 From: hirsch88 Date: Wed, 14 Mar 2018 21:59:28 +0100 Subject: [PATCH 3/8] add all test to travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index df3a0a2e..0a6a1e83 100755 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ install: - yarn install scripts: - npm test - - npm test.integration - - npm test.e2e + - npm start test.integration + - npm start test.e2e - npm start build notifications: email: false From 392ba21b58ce3e3838d10068d806592a96313074 Mon Sep 17 00:00:00 2001 From: hirsch88 Date: Wed, 14 Mar 2018 22:06:25 +0100 Subject: [PATCH 4/8] update travis config --- .travis.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a6a1e83..05302261 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,16 @@ language: node_js node_js: - - "8.2.1" + - "8.9.4" install: - - yarn install + - yarn install +env: + - DB_TYPE="sqlite" + - DB_DATABASE="./mydb.sql" + - DB_LOGGING=false scripts: - - npm test - - npm start test.integration - - npm start test.e2e - - npm start build + - npm test + - npm start test.integration + - npm start test.e2e + - npm start build notifications: - email: false + email: false From b53bff4af70b15b7d25961bb3ea350effe68e07f Mon Sep 17 00:00:00 2001 From: hirsch88 Date: Wed, 14 Mar 2018 22:13:06 +0100 Subject: [PATCH 5/8] add 2 spaces --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05302261..91225b62 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,16 @@ language: node_js node_js: - - "8.9.4" + - "8.9.4" install: - - yarn install + - yarn install env: - - DB_TYPE="sqlite" - - DB_DATABASE="./mydb.sql" - - DB_LOGGING=false + - DB_TYPE="sqlite" + - DB_DATABASE="./mydb.sql" + - DB_LOGGING=false scripts: - - npm test - - npm start test.integration - - npm start test.e2e - - npm start build + - npm test + - npm start test.integration + - npm start test.e2e + - npm start build notifications: - email: false + email: false From b0fae5664f9ab3ba5151cb4dabaf54ee536fd255 Mon Sep 17 00:00:00 2001 From: hirsch88 Date: Wed, 14 Mar 2018 22:16:31 +0100 Subject: [PATCH 6/8] update travis config --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91225b62..ac28f9ce 100755 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,11 @@ node_js: install: - yarn install env: - - DB_TYPE="sqlite" - - DB_DATABASE="./mydb.sql" - - DB_LOGGING=false + - DB_TYPE="sqlite" DB_DATABASE="./mydb.sql" DB_LOGGING=false scripts: - - npm test + - npm start build + - npm start test - npm start test.integration - npm start test.e2e - - npm start build notifications: email: false From cbbef9b0af151bbedd95ba610e1fa2d270a56ce9 Mon Sep 17 00:00:00 2001 From: hirsch88 Date: Wed, 14 Mar 2018 22:21:39 +0100 Subject: [PATCH 7/8] update travis config --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac28f9ce..5560e288 100755 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ install: - yarn install env: - DB_TYPE="sqlite" DB_DATABASE="./mydb.sql" DB_LOGGING=false -scripts: - - npm start build +script: - npm start test - npm start test.integration - npm start test.e2e + - npm start build notifications: email: false From bb27906dbdd2bfc01c73ea7ef98932bb8472c769 Mon Sep 17 00:00:00 2001 From: hirsch88 Date: Wed, 14 Mar 2018 22:27:46 +0100 Subject: [PATCH 8/8] update config appveyor --- appveyor.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3bc1c57b..d9d00e55 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,8 @@ environment: nodejs_version: "8" + DB_TYPE: "sqlite" + DB_DATABASE: "./mydb.sql" + DB_LOGGING: false install: - ps: Install-Product node $env:nodejs_version @@ -9,4 +12,6 @@ build_script: - npm start build test_script: - - npm test + - npm start test + - npm start test.integration + - npm start test.e2e