diff options
-rw-r--r-- | .circleci/config.yml | 44 | ||||
-rw-r--r-- | packages/0x.js/coverage/.gitkeep | 0 | ||||
-rw-r--r-- | packages/assert/coverage/.gitkeep | 0 | ||||
-rw-r--r-- | packages/assert/package.json | 5 | ||||
-rw-r--r-- | packages/connect/coverage/.gitkeep | 0 | ||||
-rw-r--r-- | packages/connect/package.json | 5 | ||||
-rw-r--r-- | packages/deployer/coverage/.gitkeep | 0 | ||||
-rw-r--r-- | packages/deployer/package.json | 5 | ||||
-rw-r--r-- | packages/dev-utils/coverage/.gitkeep | 0 | ||||
-rw-r--r-- | packages/dev-utils/package.json | 5 | ||||
-rw-r--r-- | packages/json-schemas/coverage/.gitkeep | 0 | ||||
-rw-r--r-- | packages/json-schemas/package.json | 5 | ||||
-rw-r--r-- | packages/subproviders/coverage/.gitkeep | 0 | ||||
-rw-r--r-- | packages/subproviders/package.json | 5 |
14 files changed, 68 insertions, 6 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index fdee10c84..3b1f55656 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,6 +74,10 @@ jobs: command: npm run testrpc -- --db testrpc_snapshot background: true - run: yarn lerna:run --scope @0xproject/deployer test:circleci + - save_cache: + key: coverage-deployer-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/deployer/coverage/lcov.info test-rest: docker: - image: circleci/node:6.12 @@ -87,6 +91,26 @@ jobs: command: npm run testrpc -- --db testrpc_snapshot background: true - run: yarn lerna:run --ignore contracts --ignore 0x.js --ignore @0xproject/deployer test:circleci + - save_cache: + key: coverage-assert-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/assert/coverage/lcov.info + - save_cache: + key: coverage-connect-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/connect/coverage/lcov.info + - save_cache: + key: coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/dev-utils/coverage/lcov.info + - save_cache: + key: coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/json-schemas/coverage/lcov.info + - save_cache: + key: coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/subproviders/coverage/lcov.info lint: working_directory: ~/repo docker: @@ -118,6 +142,24 @@ jobs: - coverage-contracts-{{ .Environment.CIRCLE_SHA1 }} - restore_cache: keys: + - coverage-assert-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-connect-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-deployer-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: - coverage-0xjs-{{ .Environment.CIRCLE_SHA1 }} - run: yarn report_coverage workflows: @@ -146,4 +188,6 @@ workflows: - submit-coverage: requires: - test-0xjs + - test-deployer + - test-rest - test-contracts diff --git a/packages/0x.js/coverage/.gitkeep b/packages/0x.js/coverage/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packages/0x.js/coverage/.gitkeep diff --git a/packages/assert/coverage/.gitkeep b/packages/assert/coverage/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packages/assert/coverage/.gitkeep diff --git a/packages/assert/package.json b/packages/assert/package.json index be5f4902d..0c8c64e16 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -12,7 +12,9 @@ "run_mocha": "mocha lib/test/**/*_test.js", "prepublishOnly": "run-p build", "test": "run-s clean build run_mocha", - "test:circleci": "yarn test" + "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", + "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", + "test:circleci": "yarn test:coverage" }, "license": "Apache-2.0", "repository": { @@ -29,6 +31,7 @@ "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", "@types/valid-url": "^1.0.2", + "nyc": "^11.0.1", "chai": "^4.0.1", "chai-typescript-typings": "^0.0.4", "copyfiles": "^1.2.0", diff --git a/packages/connect/coverage/.gitkeep b/packages/connect/coverage/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packages/connect/coverage/.gitkeep diff --git a/packages/connect/package.json b/packages/connect/package.json index 8b3b24fcd..e0478b42a 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -21,7 +21,9 @@ "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", "run_mocha": "mocha lib/test/**/*_test.js", "test": "run-s clean build copy_test_fixtures run_mocha", - "test:circleci": "yarn test" + "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", + "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", + "test:circleci": "yarn test:coverage" }, "config": { "postpublish": { @@ -62,6 +64,7 @@ "@types/mocha": "^2.2.42", "@types/query-string": "^5.0.1", "@types/websocket": "^0.0.34", + "nyc": "^11.0.1", "async-child-process": "^1.1.1", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", diff --git a/packages/deployer/coverage/.gitkeep b/packages/deployer/coverage/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packages/deployer/coverage/.gitkeep diff --git a/packages/deployer/package.json b/packages/deployer/package.json index 4bc739841..71fe4d9d7 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -8,11 +8,13 @@ "build:watch": "tsc -w", "build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "test": "npm run build; mocha lib/test/*_test.js", + "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", + "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", "compile": "npm run build; node lib/src/cli.js compile", "clean": "shx rm -rf lib scripts", "migrate": "npm run build; node lib/src/cli.js migrate", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", - "test:circleci": "yarn test" + "test:circleci": "yarn test:coverage" }, "bin": { "0x-deployer": "lib/src/cli.js" @@ -33,6 +35,7 @@ "@types/require-from-string": "^1.2.0", "chai": "^4.0.1", "copyfiles": "^1.2.0", + "nyc": "^11.0.1", "ethers-typescript-typings": "^0.0.2", "mocha": "^4.0.1", "shx": "^0.2.2", diff --git a/packages/dev-utils/coverage/.gitkeep b/packages/dev-utils/coverage/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packages/dev-utils/coverage/.gitkeep diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index f9fc4e619..bfe752982 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -8,8 +8,10 @@ "build:watch": "tsc -w", "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "test": "run-s clean build run_mocha", - "test:circleci": "yarn test", + "test:circleci": "yarn test:coverage", "run_mocha": "mocha lib/test/**/*_test.js --bail --exit", + "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", + "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", "clean": "shx rm -rf lib scripts", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'" }, @@ -28,6 +30,7 @@ "@0xproject/web3-wrapper": "^0.2.1", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", + "nyc": "^11.0.1", "chai": "^4.0.1", "chai-typescript-typings": "^0.0.4", "copyfiles": "^1.2.0", diff --git a/packages/json-schemas/coverage/.gitkeep b/packages/json-schemas/coverage/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packages/json-schemas/coverage/.gitkeep diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index e775130cb..84ed0c209 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -8,7 +8,9 @@ "build:watch": "tsc -w", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", "test": "run-s clean build run_mocha", - "test:circleci": "yarn test", + "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", + "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", + "test:circleci": "yarn test:coverage", "run_mocha": "mocha lib/test/**/*_test.js", "clean": "shx rm -rf _bundles lib test_temp scripts", "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts" @@ -34,6 +36,7 @@ "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", + "nyc": "^11.0.1", "chai": "^4.0.1", "chai-typescript-typings": "^0.0.4", "copyfiles": "^1.2.0", diff --git a/packages/subproviders/coverage/.gitkeep b/packages/subproviders/coverage/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packages/subproviders/coverage/.gitkeep diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index b49dfd67f..100ed8f87 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -12,7 +12,9 @@ "run_mocha_unit": "mocha lib/test/unit/**/*_test.js --timeout 10000 --bail --exit", "run_mocha_integration": "mocha lib/test/integration/**/*_test.js --timeout 10000 --bail --exit", "test": "npm run test:unit", - "test:circleci": "npm run test:unit", + "test:unit:coverage": "nyc npm run test:unit --all && yarn coverage:report:lcov", + "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", + "test:circleci": "npm run test:unit:coverage", "test:all": "run-s test:unit test:integration", "test:unit": "run-s clean build run_mocha_unit", "test:integration": "run-s clean build run_mocha_integration" @@ -42,6 +44,7 @@ "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", "@types/node": "^8.0.53", + "nyc": "^11.0.1", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "chai-as-promised-typescript-typings": "^0.0.10", |