diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-03-14 02:09:16 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-03-14 02:09:16 +0800 |
| commit | 0334004b11564d4c23dd64bcf1ee4f9c6097a466 (patch) | |
| tree | 097c2ab81ecccd5fd8734e170e0f70460013f90a /packages | |
| parent | 11ed5d62baa0cce4014afaf6986a0745cc853bef (diff) | |
| download | dexon-0x-contracts-0334004b11564d4c23dd64bcf1ee4f9c6097a466.tar dexon-0x-contracts-0334004b11564d4c23dd64bcf1ee4f9c6097a466.tar.gz dexon-0x-contracts-0334004b11564d4c23dd64bcf1ee4f9c6097a466.tar.bz2 dexon-0x-contracts-0334004b11564d4c23dd64bcf1ee4f9c6097a466.tar.lz dexon-0x-contracts-0334004b11564d4c23dd64bcf1ee4f9c6097a466.tar.xz dexon-0x-contracts-0334004b11564d4c23dd64bcf1ee4f9c6097a466.tar.zst dexon-0x-contracts-0334004b11564d4c23dd64bcf1ee4f9c6097a466.zip | |
Revert "Report all coverage reports together"
This reverts commit 11ed5d62baa0cce4014afaf6986a0745cc853bef.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/0x.js/coverage/.gitkeep | 0 | ||||
| -rw-r--r-- | packages/0x.js/package.json | 7 | ||||
| -rw-r--r-- | packages/contracts/package.json | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/packages/0x.js/coverage/.gitkeep b/packages/0x.js/coverage/.gitkeep deleted file mode 100644 index e69de29bb..000000000 --- a/packages/0x.js/coverage/.gitkeep +++ /dev/null diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index c34bffc46..4a4d6d2c8 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -19,10 +19,10 @@ "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json", "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", - "test:circleci": "run-s test:coverage", + "test:circleci": "run-s test:coverage report_test_coverage", "test": "run-s clean test:commonjs", - "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", - "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", + "test:coverage": "nyc npm run test --all", + "report_test_coverage": "nyc report --reporter=text-lcov | coveralls", "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../0x.js/src/artifacts; done;", "clean": "shx rm -rf _bundles lib test_temp", "build:umd:prod": "NODE_ENV=production webpack", @@ -59,6 +59,7 @@ "chai-bignumber": "^2.0.1", "chai-typescript-typings": "^0.0.4", "copyfiles": "^1.2.0", + "coveralls": "^3.0.0", "dirty-chai": "^2.0.1", "json-loader": "^0.5.4", "mocha": "^4.0.1", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 371aba8ab..05d305942 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -13,7 +13,7 @@ "copy_artifacts": "copyfiles './src/artifacts/**/*' ./lib", "build": "tsc", "test": "run-s build run_mocha", - "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", + "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text", "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit", "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846", "compile": "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir src/artifacts", @@ -24,7 +24,8 @@ "coverage:report:text": "istanbul report text", "coverage:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", - "test:circleci": "yarn test:coverage" + "coverage:report:coveralls": "yarn coverage:report:lcov && cat coverage/lcov.info | coveralls", + "test:circleci": "yarn test:coverage && yarn coverage:report:coveralls" }, "config": { "contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,Arbitrage,EtherDelta,AccountLevels" @@ -53,6 +54,7 @@ "chai-bignumber": "^2.0.1", "chai-typescript-typings": "^0.0.4", "copyfiles": "^1.2.0", + "coveralls": "^3.0.0", "dirty-chai": "^2.0.1", "ethers-typescript-typings": "^0.0.2", "mocha": "^4.0.1", |