Skip to content

Commit

Permalink
Merge pull request #698 from poanetwork/update-e2e-tests
Browse files Browse the repository at this point in the history
(Fix) e2e tests with current changes on local deployment in Travis CI
  • Loading branch information
vbaranov authored Mar 15, 2018
2 parents ab868b2 + d678fb4 commit cf05df9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"mobx": "^3.3.0",
"mobx-react": "^4.3.3",
"moment": "^2.20.1",
"npm-delay": "^1.0.4",
"object-assign": "4.1.1",
"papaparse": "^4.3.7",
"path": "^0.12.7",
Expand Down Expand Up @@ -128,7 +129,10 @@
"build": "git submodule update --init --recursive --remote && cd submodules/solidity-flattener && npm install && cd ../../ && npm install && cd submodules/poa-web3-1.0 && npm install && cd ../../ && npm install --no-save submodules/poa-web3-1.0/packages/web3 && npm run generateContracts && npm run compileContracts && node scripts/build.js && cp ./build/index.html ./build/invest.html && cp ./build/index.html ./build/crowdsale.html && cp ./build/index.html ./build/manage.html",
"test": "npm run test:e2e && bash ./start_testrpc.sh && cd ./submodules/poa-token-market-net-ico/ && npm install && node_modules/.bin/truffle migrate --network testrpc && node_modules/.bin/truffle test --network testrpc",
"test:dapp": "jest --env=jsdom",
"test:e2e": "cd submodules/token-wizard-test-automation && npm i && npm run test1",
"e2e-prepare-start": "npm run generateContracts && npm run compileContracts && cp .env.example .env",
"e2e-start": "PORT=3000 BROWSER=none node scripts/start.js &",
"delay": "node ./node_modules/npm-delay 30000",
"test:e2e": "npm run e2e-prepare-start && npm run e2e-start && npm run delay && cd submodules/token-wizard-test-automation && npm i && npm run test1",
"coveralls": "jest --env=jsdom --coverage && cat coverage/lcov.info | coveralls",
"generateContracts": "npm run generateFlatSoliditySafeMathLibContract && npm run generateFlatSolidityCrowdsaleNullFinalizeAgentContract && npm run generateFlatSolidityCrowdsaleFinalizeAgentContract && npm run generateFlatSolidityCrowdsaleContract && npm run generateFlatSolidityCrowdsaleTokenContract && npm run generateFlatSolidityCrowdsalePricingStrategyContract && npm run generateFlatSolidityRegistryContract",
"generateFlatSoliditySafeMathLibContract": "node $npm_package_config_combine_solidity_script $npm_package_config_tokenmarketnet_path/$npm_package_config_safe_math_lib_contract_name.sol $npm_package_config_contract_folder SafeMathLibExt",
Expand Down
2 changes: 1 addition & 1 deletion submodules/token-wizard-test-automation

0 comments on commit cf05df9

Please sign in to comment.