Skip to content
This repository was archived by the owner on Jun 10, 2021. It is now read-only.

Commit 350cfd2

Browse files
committed
Check passing e2e
1 parent 0f126fc commit 350cfd2

File tree

3 files changed

+27
-22
lines changed

3 files changed

+27
-22
lines changed

.gitlab-ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ test:
2323
- staging
2424
- develop
2525

26-
deploymaster:
27-
image: kylessg/bullet-train-gcloud:1.0
28-
stage: deploy
29-
script:
30-
- npm i
31-
- export ENV=prod; npm run env
32-
- npm run dotenv
33-
- npm run bundle
34-
- echo $DEPLOY_KEY_FILE_PROD > /tmp/$CI_PIPELINE_ID.json
35-
- gcloud auth activate-service-account --key-file /tmp/$CI_PIPELINE_ID.json
36-
- gcloud config set project bullet-train-front-end-prod
37-
- gcloud app deploy
38-
only:
39-
- master
26+
#deploymaster:
27+
# image: kylessg/bullet-train-gcloud:1.0
28+
# stage: deploy
29+
# script:
30+
# - npm i
31+
# - export ENV=prod; npm run env
32+
# - npm run dotenv
33+
# - npm run bundle
34+
# - echo $DEPLOY_KEY_FILE_PROD > /tmp/$CI_PIPELINE_ID.json
35+
# - gcloud auth activate-service-account --key-file /tmp/$CI_PIPELINE_ID.json
36+
# - gcloud config set project bullet-train-front-end-prod
37+
# - gcloud app deploy
38+
# only:
39+
# - master
4040

4141
deploystaging:
4242
image: kylessg/bullet-train-gcloud:1.0

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"scripts": {
77
"kill": "kill -9 $(lsof -ti tcp:4444)",
88
"test": "cross-env E2E=true nightwatch ./tests/index.test.js",
9+
"test:pause": "cross-env PAUSE=true E2E=true nightwatch ./tests/index.test.js",
10+
"test:brk": "cross-env BRK=true E2E=true nightwatch ./tests/index.test.js",
911
"env": "node ./bin/env.js",
1012
"start": "cross-env NODE_ENV=production node ./server",
1113
"dev": "cross-env npm run env && node_modules/.bin/nodemon --watch server --ignore server/config/config.json --watch webpack --exec node ./server",

tests/index.test.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ const sendFailure = (browser, done, request, error) => {
9090
let testsFailed;
9191

9292
const exitTests = (browser, done) => {
93+
if (process.env.BRK)
94+
return
9395
browser.end();
9496
done();
9597
server.kill('SIGINT');
@@ -110,7 +112,7 @@ module.exports = Object.assign(
110112
}
111113
server = fork('./server');
112114
server.on('message', () => {
113-
clearDown(browser, done);
115+
clearDown(browser, process.env.PAUSE ? null : done);
114116
});
115117
},
116118
afterEach: (browser, done) => {
@@ -151,13 +153,14 @@ module.exports = Object.assign(
151153
},
152154

153155
require('./initialise.test'), // Register as the demo user
154-
require('./features.test'), // Features tests
156+
// require('./features.test'), // Features tests
155157
require('./segments.test'), // Segments tests
156158
require('./segement-priorities.test'), // Segments tests
157-
require('./users.test'), // Users tests
158-
require('./project.test'), // Project/environment tests
159-
require('./initial-cleanup.test'), // Cleanup initialisation
160-
require('./invite.test'), // Invite user tests
161-
require('./register-fail.test'), // Registration failure tests
162-
require('./login-fail.test'), // Login failure tests
159+
// require('./users.test'), // Users tests
160+
// require('./project.test'), // Project/environment tests
161+
// require('./initial-cleanup.test'), // Cleanup initialisation
162+
// require('./invite.test'), // Invite user tests
163+
// require('./register-fail.test'), // Registration failure tests
164+
// require('./login-fail.test'), // Login failure tests
163165
);
166+

0 commit comments

Comments
 (0)