From d571f5ee701acd87495ad8ed69a74e6c5ca424f3 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Sun, 23 Jul 2017 21:32:49 -0700 Subject: Add Test Coverage with nyc package and coveralls for github badge --- .gitignore | 5 ++++- README.md | 2 +- package.json | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 85c2d15d6..1806b1932 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,7 @@ test/background.js test/bundle.js test/test-bundle.js -notes.txt \ No newline at end of file +notes.txt + +.coveralls.yml +.nyc_output \ No newline at end of file diff --git a/README.md b/README.md index d7086ae91..9aded09c1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MetaMask Plugin [![Build Status](https://circleci.com/gh/MetaMask/metamask-extension.svg?style=shield&circle-token=a1ddcf3cd38e29267f254c9c59d556d513e3a1fd)](https://circleci.com/gh/MetaMask/metamask-extension) +# MetaMask Plugin [![Build Status](https://circleci.com/gh/MetaMask/metamask-extension.svg?style=shield&circle-token=a1ddcf3cd38e29267f254c9c59d556d513e3a1fd)](https://circleci.com/gh/MetaMask/metamask-extension) [![Coverage Status](https://coveralls.io/repos/github/MetaMask/metamask-extension/badge.svg?branch=master)](https://coveralls.io/github/MetaMask/metamask-extension?branch=master) ## Support diff --git a/package.json b/package.json index 375902d09..ef6e55980 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"", "single-test": "METAMASK_ENV=test mocha --require test/helper.js", "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2", + "test-coverage": "nyc --reporter=text npm run test-unit", "lint": "gulp lint", "buildCiUnits": "node test/integration/index.js", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", @@ -144,6 +145,7 @@ "brfs": "^1.4.3", "browserify": "^13.0.0", "chai": "^3.5.0", + "coveralls": "^2.13.1", "deep-freeze-strict": "^1.1.1", "del": "^2.2.0", "envify": "^4.0.0", @@ -170,6 +172,7 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^1.1.5", "nock": "^8.0.0", + "nyc": "^11.0.3", "open": "0.0.5", "prompt": "^1.0.0", "qs": "^6.2.0", -- cgit From 55b7e457c504df0b0dadc848bc631704a950a14d Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Sun, 23 Jul 2017 21:35:21 -0700 Subject: Configure ci build to run tests individually --- circle.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/circle.yml b/circle.yml index 66eed17d7..efeb8ba57 100644 --- a/circle.yml +++ b/circle.yml @@ -5,3 +5,8 @@ dependencies: pre: - "npm i -g testem" - "npm i -g mocha" +test: + override: + - "npm run lint" + - "npm run test-coverage" + - "npm run test-integration" \ No newline at end of file -- cgit From 24ffb40ec77016259ba4bb1b838298bf119f695e Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Mon, 24 Jul 2017 09:06:40 -0700 Subject: Add coveralls to script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef6e55980..d90cc5e3b 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"", "single-test": "METAMASK_ENV=test mocha --require test/helper.js", "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2", - "test-coverage": "nyc --reporter=text npm run test-unit", + "test-coverage": "nyc --reporter=lcov --reporter=text npm run test-unit && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage", "lint": "gulp lint", "buildCiUnits": "node test/integration/index.js", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", -- cgit From a1fab0649035b75604dbee5aa18077c5cd747b3b Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Mon, 24 Jul 2017 13:46:02 -0700 Subject: Simplify the test-coverage script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d90cc5e3b..fe5466b9e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"", "single-test": "METAMASK_ENV=test mocha --require test/helper.js", "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2", - "test-coverage": "nyc --reporter=lcov --reporter=text npm run test-unit && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage", + "test-coverage": "nyc npm run test-unit && nyc report --reporter=text-lcov | coveralls", "lint": "gulp lint", "buildCiUnits": "node test/integration/index.js", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", -- cgit From eb1566349723804e688f95a06f1208767e6d1938 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Tue, 25 Jul 2017 16:33:52 -0700 Subject: One script runs for Ci build --- circle.yml | 4 +--- package.json | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index efeb8ba57..2ea60bb9d 100644 --- a/circle.yml +++ b/circle.yml @@ -7,6 +7,4 @@ dependencies: - "npm i -g mocha" test: override: - - "npm run lint" - - "npm run test-coverage" - - "npm run test-integration" \ No newline at end of file + - "npm run ci" \ No newline at end of file diff --git a/package.json b/package.json index fe5466b9e..6d5227356 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "single-test": "METAMASK_ENV=test mocha --require test/helper.js", "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2", "test-coverage": "nyc npm run test-unit && nyc report --reporter=text-lcov | coveralls", + "ci": "npm run lint && npm run test-coverage && npm run test-integration", "lint": "gulp lint", "buildCiUnits": "node test/integration/index.js", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", -- cgit From 3575bd49ab4f3ec879a3e04b4a6fa35fe9c67c6e Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Tue, 25 Jul 2017 16:59:08 -0700 Subject: Run coveralls on all branches --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9aded09c1..27b19c91c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MetaMask Plugin [![Build Status](https://circleci.com/gh/MetaMask/metamask-extension.svg?style=shield&circle-token=a1ddcf3cd38e29267f254c9c59d556d513e3a1fd)](https://circleci.com/gh/MetaMask/metamask-extension) [![Coverage Status](https://coveralls.io/repos/github/MetaMask/metamask-extension/badge.svg?branch=master)](https://coveralls.io/github/MetaMask/metamask-extension?branch=master) +# MetaMask Plugin [![Build Status](https://circleci.com/gh/MetaMask/metamask-extension.svg?style=shield&circle-token=a1ddcf3cd38e29267f254c9c59d556d513e3a1fd)](https://circleci.com/gh/MetaMask/metamask-extension) [![Coverage Status](https://coveralls.io/repos/github/MetaMask/metamask-extension/badge.svg?branch=master)](https://coveralls.io/github/MetaMask/metamask-extension) ## Support -- cgit