From 73c9680c6b88236bc9250eff22cad1f55cafc81b Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 12 Mar 2019 16:17:16 -0500 Subject: [PATCH] fix test results page in pipelines probably need this and this w/e fixes doesn't like root level reports switch to junit --- .gitignore | 2 + package.json | 5 +- scripts/.azure-test-template.yml | 4 ++ yarn.lock | 84 ++++++++++++++++++++++++++++++-- 4 files changed, 89 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c9d3dccb..f365d3ce 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ coverage/ .nyc_output/ dist/ docs/ + +ava\.xml diff --git a/package.json b/package.json index 7601b11f..2b19d493 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "build": "tsc", "test": "yarn build && ava test/*.ts", "test:lint": "tslint '{test,src}/**/*.ts'", - "test:coverage": "yarn coverage && nyc check-coverage --lines 60 --functions 60 --branches 60", - "coverage": "npx nyc npm test", + "test:coverage": "nyc check-coverage --lines 60 --functions 60 --branches 60", + "coverage": "npx nyc yarn test", "coverage:azure": "npx nyc report --reporter=cobertura --reporter=html", "docs": "typedoc --mode file --out ./dist/ ./src/", "lint": "tslint --fix '{test,src}/**/*.ts'" @@ -41,6 +41,7 @@ "eslint": "^5.2.0", "eslint-config-klasa": "dirigeants/klasa-lint", "nyc": "^13.0.1", + "tap-junit": "^3.0.2", "ts-node": "^8.0.3", "tslint": "^5.7.0", "typedoc": "^0.14.2", diff --git a/scripts/.azure-test-template.yml b/scripts/.azure-test-template.yml index 9d9162d6..957a1ac8 100644 --- a/scripts/.azure-test-template.yml +++ b/scripts/.azure-test-template.yml @@ -20,8 +20,12 @@ jobs: versionSpec: $(nodeVersion) displayName: 'Install Node.js' - script: 'yarn' + - script: 'yarn nyc yarn test --tap | yarn tap-junit > ./${{ parameters.name }}-$(nodeVersion).xml' - script: 'yarn run test:coverage' - script: 'yarn run coverage:azure' + - task: PublishTestResults@2 + inputs: + testResultsFiles: $(System.DefaultWorkingDirectory)/${{ parameters.name }}-$(nodeVersion).xml - task: PublishCodeCoverageResults@1 inputs: codeCoverageTool: 'cobertura' diff --git a/yarn.lock b/yarn.lock index ab427883..2d2ecf3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -352,10 +352,15 @@ version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" -"@types/node@*", "@types/node@^11.9.6": +"@types/node@*": version "11.11.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.1.tgz#9ee55ffce20f72e141863b0036a6e51c6fc09a1f" +"@types/node@^11.11.0": + version "11.11.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.2.tgz#873d2c3f3824212cc16130074699e1bcb38c0231" + integrity sha512-iEaHiDNkHv4Jrm9O5T37OYEUwjJesiyt6ZlhLFK0sbo4CLD0jyCOB4Pc2F9iD3MbW2397SLNxZKdDGntGaBjQQ== + "@types/shelljs@^0.8.0": version "0.8.2" resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.2.tgz#6fa9314497ec7b61c28a21485bfa915e64894751" @@ -686,6 +691,11 @@ buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" +buffer-shims@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" + integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E= + builtin-modules@^1.0.0, builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -1692,7 +1702,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.3, inherits@~2.0.3: +inherits@2, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -2307,7 +2317,7 @@ minimist@0.0.8: version "0.0.8" resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" -minimist@^1.2.0: +minimist@1.2.0, minimist@^1.2.0: version "1.2.0" resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -2769,6 +2779,11 @@ pretty-ms@^4.0.0: dependencies: parse-ms "^2.0.0" +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + process-nextick-args@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" @@ -2805,6 +2820,11 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +re-emitter@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/re-emitter/-/re-emitter-1.1.3.tgz#fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7" + integrity sha1-+p4xn/3u6zWycpbvDz03TawvUqc= + read-pkg-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" @@ -2827,6 +2847,19 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" +readable-stream@2.2.9: + version "2.2.9" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8" + integrity sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g= + dependencies: + buffer-shims "~1.0.0" + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~1.0.0" + util-deprecate "~1.0.1" + readable-stream@^2.0.2, readable-stream@^2.0.6: version "2.3.6" resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" @@ -3195,6 +3228,13 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" +split@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/split/-/split-1.0.0.tgz#c4395ce683abcd254bc28fe1dabb6e5c27dcffae" + integrity sha1-xDlc5oOrzSVLwo/h2rtuXCfc/64= + dependencies: + through "2" + sprintf-js@~1.0.2: version "1.0.3" resolved "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -3233,6 +3273,13 @@ string-width@^3.0.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.0.0" +string_decoder@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" + integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== + dependencies: + safe-buffer "~5.1.0" + string_decoder@~1.1.1: version "1.1.1" resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -3322,6 +3369,25 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" +tap-junit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/tap-junit/-/tap-junit-3.0.2.tgz#c1ce73a32f3584bcb033f34529dff6607566596e" + integrity sha512-aF8TUAjNTUGF+RLsMOY1wJ1EvO/XtdqveuXEC2VAfiu1HQNgbm00Dl60mFtiuY72j2Ll9AtOWUm5aLHlzdVxig== + dependencies: + minimist "1.2.0" + tap-out "3.0.0" + xmlbuilder "10.1.1" + +tap-out@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tap-out/-/tap-out-3.0.0.tgz#2edd86498cb1c0d7f33293d5717f9a44d939186d" + integrity sha512-JzlrjCL3anqI9xHGPfYb6Mo+6nYs60m0tDy6i0sWhYDlrBDVerYPNWoUo1buK3YeWQFdm42KQv8wu9qLf1tL5A== + dependencies: + re-emitter "1.1.3" + readable-stream "2.2.9" + split "1.0.0" + trim "0.0.1" + tar@^4: version "4.4.8" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" @@ -3353,7 +3419,7 @@ text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" -through@^2.3.6: +through@2, through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -3409,6 +3475,11 @@ trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" +trim@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= + ts-node@^8.0.3: version "8.0.3" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.3.tgz#aa60b836a24dafd8bf21b54766841a232fdbc641" @@ -3686,6 +3757,11 @@ xdg-basedir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" +xmlbuilder@10.1.1: + version "10.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.1.1.tgz#8cae6688cc9b38d850b7c8d3c0a4161dcaf475b0" + integrity sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg== + xtend@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"