From 83cab7563d91fa461ae25a433f99fd021eb40da1 Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 26 Oct 2018 02:20:10 +0100 Subject: [PATCH 1/6] Add nyc to travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e50920c6db..4259b8fca1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ node_js: install: - npm install - npm install -g codecov + - npm install -g nyc script: - npm run lint - npm test @@ -49,6 +50,7 @@ after_success: - npm run typedoc - echo "docx.js.org" > docs/.nojekyll - echo "docx.js.org" > docs/CNAME + - nyc report --reporter=json - codecov deploy: provider: pages From 9143c1c2c16068c2454977330d385b47ede9fc7e Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 26 Oct 2018 20:11:40 +0100 Subject: [PATCH 2/6] Add nyc support --- .gitignore | 7 +++++-- .nycrc | 26 ++++++++++++++++++++++++++ .travis.yml | 3 +-- package.json | 10 ++++++---- webpack.config.js | 8 ++++++++ 5 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 .nycrc diff --git a/.gitignore b/.gitignore index e6143b4db7..8a7c8baf67 100644 --- a/.gitignore +++ b/.gitignore @@ -58,5 +58,8 @@ yarn.lock # Documents My Document.docx -# Temporary folder -tmp \ No newline at end of file +# Temporary folder +tmp + +# nyc +.nyc_output diff --git a/.nycrc b/.nycrc new file mode 100644 index 0000000000..47efcb3120 --- /dev/null +++ b/.nycrc @@ -0,0 +1,26 @@ +{ + "check-coverage": true, + "lines": 84.56, + "functions": 77.50, + "branches": 71.40, + "statements": 84.30, + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "build/", + "src/**/*.spec.ts" + ], + "reporter": [ + "lcov", + "text", + "json" + ], + "extension": [ + ".ts" + ], + "cache": true, + "all": true, + "instrument": false, + "sourceMap": true +} diff --git a/.travis.yml b/.travis.yml index 4259b8fca1..61f6dcac36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ node_js: install: - npm install - npm install -g codecov - - npm install -g nyc script: - npm run lint - npm test @@ -50,7 +49,7 @@ after_success: - npm run typedoc - echo "docx.js.org" > docs/.nojekyll - echo "docx.js.org" > docs/CNAME - - nyc report --reporter=json + - npm run cover - codecov deploy: provider: pages diff --git a/package.json b/package.json index 802c2bfb62..123988d425 100644 --- a/package.json +++ b/package.json @@ -6,19 +6,19 @@ "scripts": { "pretest": "rimraf ./build", "test": "mocha-webpack \"src/**/*.ts\"", - "test-watch": "mocha-webpack \"src/**/*.ts\" --watch", + "test.watch": "npm test -- --watch", "prepublishOnly": "npm run build", "lint": "tslint --project .", "build": "npm run webpack && npm run fix-types", "tsc": "rimraf ./build && tsc -p .", "webpack": "rimraf ./build && webpack", - "build.web": "webpack --config webpack.web.config.js", "demo": "npm run build && npm run ts-node ./demo", "typedoc": "typedoc src/index.ts", "style": "prettier -l \"src/**/*.ts\"", - "style.fix": "prettier \"src/**/*.ts\" --write", + "style.fix": "npm run style -- --write", "fix-types": "node types-absolute-fixer.js", - "ts-node": "ts-node" + "ts-node": "ts-node", + "cover": "nyc npm run test" }, "pre-commit": [ "style", @@ -67,9 +67,11 @@ "awesome-typescript-loader": "^3.4.1", "chai": "^3.5.0", "glob": "^7.1.2", + "istanbul-instrumenter-loader": "^3.0.1", "jszip": "^3.1.5", "mocha": "^5.2.0", "mocha-webpack": "^1.0.1", + "nyc": "^13.1.0", "pre-commit": "^1.2.2", "prettier": "^1.12.1", "prompt": "^1.0.0", diff --git a/webpack.config.js b/webpack.config.js index 01ecff1540..40ec0b0d23 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -20,6 +20,14 @@ module.exports = { test: /\.ts$/, loaders: ["awesome-typescript-loader"], }, + { + // For coverage testing + test: /\.(ts)/, + include: path.resolve("src"), + loader: "istanbul-instrumenter-loader", + enforce: "post", + exclude: [/node_modules/], + } ], }, From 21df53d547d7263cc192d5090ad9796041b1719a Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 26 Oct 2018 20:16:18 +0100 Subject: [PATCH 3/6] Clean up --- .nycrc | 1 - package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.nycrc b/.nycrc index 47efcb3120..7c878bae51 100644 --- a/.nycrc +++ b/.nycrc @@ -8,7 +8,6 @@ "src/**/*.ts" ], "exclude": [ - "build/", "src/**/*.spec.ts" ], "reporter": [ diff --git a/package.json b/package.json index 123988d425..ec5473a1f8 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "style.fix": "npm run style -- --write", "fix-types": "node types-absolute-fixer.js", "ts-node": "ts-node", - "cover": "nyc npm run test" + "cover": "nyc npm test" }, "pre-commit": [ "style", From 2b834a75a88e32d7c7b194dfb3f18be6a217370b Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 26 Oct 2018 20:22:33 +0100 Subject: [PATCH 4/6] Add codecov badge --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index f387c41a14..f9120883e0 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ [![Known Vulnerabilities][snky-image]][snky-url] [![Chat on Gitter][gitter-image]][gitter-url] [![PRs Welcome][pr-image]][pr-url] +[![codecov][codecov-image]][codecov-url]

drawing @@ -81,3 +82,5 @@ Made with 💖 [gitter-url]: https://gitter.im/docx-lib/Lobby [pr-image]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg [pr-url]: http://makeapullrequest.com +[codecov-image]: https://codecov.io/gh/dolanmiu/docx/branch/master/graph/badge.svg +[codecov-url]: https://codecov.io/gh/dolanmiu/docx From 3346b97ee7001d653e6e9b21f31cff0e2e35af62 Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 26 Oct 2018 20:23:26 +0100 Subject: [PATCH 5/6] Clean up --- .travis.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 61f6dcac36..cb1a39f939 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ after_success: - npm run typedoc - echo "docx.js.org" > docs/.nojekyll - echo "docx.js.org" > docs/CNAME - - npm run cover + - npm run coverage - codecov deploy: provider: pages diff --git a/package.json b/package.json index ec5473a1f8..db5c6fec62 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "style.fix": "npm run style -- --write", "fix-types": "node types-absolute-fixer.js", "ts-node": "ts-node", - "cover": "nyc npm test" + "coverage": "nyc report" }, "pre-commit": [ "style", From ea3777d28ba96bd055e4295ea92b1f879d0f1554 Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 26 Oct 2018 20:30:42 +0100 Subject: [PATCH 6/6] Better naming --- .travis.yml | 3 +-- package.json | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb1a39f939..e84682f2da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ install: - npm install -g codecov script: - npm run lint - - npm test + - npm run test.coverage - npm run style - npm run build - npm run ts-node -- ./demo/demo1.ts @@ -49,7 +49,6 @@ after_success: - npm run typedoc - echo "docx.js.org" > docs/.nojekyll - echo "docx.js.org" > docs/CNAME - - npm run coverage - codecov deploy: provider: pages diff --git a/package.json b/package.json index db5c6fec62..32fdc7a467 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "pretest": "rimraf ./build", "test": "mocha-webpack \"src/**/*.ts\"", + "test.coverage": "nyc npm test", "test.watch": "npm test -- --watch", "prepublishOnly": "npm run build", "lint": "tslint --project .", @@ -17,8 +18,7 @@ "style": "prettier -l \"src/**/*.ts\"", "style.fix": "npm run style -- --write", "fix-types": "node types-absolute-fixer.js", - "ts-node": "ts-node", - "coverage": "nyc report" + "ts-node": "ts-node" }, "pre-commit": [ "style",