From 55e00bc56e89d9cc8281a855af77a97343f5f500 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Fri, 14 Dec 2018 11:48:16 -0800 Subject: [PATCH] Enable coverage in ci --- .gitignore | 1 + azure-pipelines.yml | 6 +++--- mocha.config.json | 3 +++ package.json | 14 +++++++++----- test/mocha.opts | 3 ++- 5 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 mocha.config.json diff --git a/.gitignore b/.gitignore index a7523ee..8aa7a2c 100644 --- a/.gitignore +++ b/.gitignore @@ -92,6 +92,7 @@ dist/ *.d.ts.map *.js *.js.map +test-results.xml # Rollup !rollup.config.js diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 924408c..7a5c30b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,13 +29,13 @@ jobs: customCommand: test - task: PublishTestResults@2 inputs: - testResultsFiles: '**/test-results.xml' + testResultsFiles: '$(System.DefaultWorkingDirectory)/test-results.xml' testRunTitle: 'Test results for JavaScript' - task: PublishCodeCoverageResults@1 inputs: codeCoverageTool: Cobertura - summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/*coverage.xml' - reportDirectory: '$(System.DefaultWorkingDirectory)/**/coverage' + summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml' + reportDirectory: '$(System.DefaultWorkingDirectory)/coverage/' - job: Build pool: vmImage: 'Ubuntu 16.04' diff --git a/mocha.config.json b/mocha.config.json new file mode 100644 index 0000000..9e51748 --- /dev/null +++ b/mocha.config.json @@ -0,0 +1,3 @@ +{ + "reporterEnabled": "list, mocha-junit-reporter" +} \ No newline at end of file diff --git a/package.json b/package.json index 257db62..4904647 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,11 @@ "@types/node": "^10.9.4", "chai": "^4.1.2", "mocha": "^5.2.0", + "mocha-junit-reporter": "^1.18.0", + "mocha-multi-reporters": "^1.1.7", "npm-run-all": "^4.1.5", "nyc": "^13.1.0", + "opn-cli": "^4.0.0", "rollup": "^0.67.3", "rollup-plugin-node-resolve": "^3.4.0", "rollup-plugin-sourcemaps": "^0.4.2", @@ -78,14 +81,14 @@ ".ts" ], "exclude": [ - "**/*.d.ts" - ], - "include": [ - "lib/**/*.ts" + "coverage/**/*", + "**/*.d.ts", + "**/*.js" ], "reporter": [ "text", - "html" + "html", + "cobertura" ], "all": true }, @@ -98,6 +101,7 @@ "test": "run-p test:tslint test:unit", "test:unit": "nyc mocha", "test:tslint": "tslint -p . -c tslint.json --exclude test/**/*.ts", + "test:coverage": "npm run test && opn coverage/index.html", "prepack": "npm install && npm run build", "publish-preview": "npm test && shx rm -rf dist/test && node ./.scripts/publish", "local": "npm explore @ts-common/azure-js-dev-tools -- npm run local", diff --git a/test/mocha.opts b/test/mocha.opts index 01f156a..294e333 100644 --- a/test/mocha.opts +++ b/test/mocha.opts @@ -1,5 +1,6 @@ --require ts-node/register --timeout 50000 ---reporter list +--reporter mocha-multi-reporters +--reporter-options configFile=mocha.config.json --colors test/**/*.ts \ No newline at end of file