Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Some E2E tests were failing on Jenkins - Closes #1055 #1056

Merged
merged 2 commits into from
Apr 17, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -146,14 +146,15 @@ node('lisk-nano') {

# Run end-to-end tests

npm run serve -- $WORKSPACE/app/build -p 300$N -a 127.0.0.1 &>server.log &
if [ -z $CHANGE_BRANCH ]; then
npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --params.liskCoreURL https://testnet.lisk.io --cucumberOpts.tags @testnet --params.useTestnetPassphrase true
npm run --silent e2e-test -- --params.baseURL http://127.0.0.1:300$N --params.liskCoreURL https://testnet.lisk.io --cucumberOpts.tags @testnet --params.useTestnetPassphrase true
else
echo "Skipping @testnet end-to-end tests because we're not on 'development' branch"
fi
npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --params.liskCoreURL http://127.0.0.1:400$N
npm run --silent e2e-test -- --params.baseURL http://127.0.0.1:300$N --params.liskCoreURL http://127.0.0.1:400$N
if [ -z $CHANGE_BRANCH ]; then
npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --cucumberOpts.tags @testnet --params.useTestnetPassphrase true --params.network testnet
npm run --silent e2e-test -- --params.baseURL http://127.0.0.1:300$N --cucumberOpts.tags @testnet --params.useTestnetPassphrase true --params.network testnet
else
echo "Skipping @testnet end-to-end tests because we're not on 'development' branch"
fi
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -25,7 +25,8 @@
"pack": "npm install && npm run build && npm run clean-dist && npm run dist",
"pack:win": "cmd /c npm install && npm run clean-build && npm run copy-files && npm run build-prod && npm run build-electron && npm run clean-dist && npm run dist:win",
"storybook": "start-storybook -p 6006 -s ./src/",
"build-storybook": "build-storybook"
"build-storybook": "build-storybook",
"serve": "http-server"
},
"author": "Lisk Foundation <[email protected]>, lightcurve GmbH <[email protected]>",
"license": "GPL-3.0",
@@ -125,7 +126,7 @@
"postcss-loader": "=2.0.6",
"postcss-partial-import": "=4.1.0",
"postcss-reporter": "5.0.0",
"protractor": "5.1.2",
"protractor": "5.3.1",
"protractor-cucumber-framework": "3.1.0",
"raw-loader": "1.0.0-beta.0",
"react-addons-test-utils": "=15.6.0",
@@ -143,7 +144,8 @@
"url-loader": "0.5.9",
"webpack": "3.6.0",
"webpack-bundle-analyzer": "2.9.0",
"webpack-dev-server": "2.8.2"
"webpack-dev-server": "2.8.2",
"http-server": "0.11.1"
},
"build": {
"appId": "io.lisk.nano",