From 60673927005c96b6324d3ae3b8ebcf1652e1bf34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl?= Date: Mon, 29 Jul 2019 16:26:33 +0200 Subject: [PATCH 1/3] VSTS-201 - Add mock to a method to avoid error on QA (AzDO) --- common/ts/__tests__/publish-task-test.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/ts/__tests__/publish-task-test.ts b/common/ts/__tests__/publish-task-test.ts index 6dabbd53..e128c2b4 100644 --- a/common/ts/__tests__/publish-task-test.ts +++ b/common/ts/__tests__/publish-task-test.ts @@ -136,6 +136,8 @@ it('task should not fail the task even if all ceTasks timeout', async () => { .spyOn(serverUtils, 'publishBuildSummary') .mockImplementation(() => null); + jest.spyOn(Metrics, 'getAllMetrics').mockImplementation(() => METRICS); + await publishTask.default(EndpointType.SonarCloud); expect(serverUtils.publishBuildSummary).toHaveBeenCalledTimes(1); From f576e13003a36babb60b27975f097726ddf7c9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl?= Date: Tue, 30 Jul 2019 09:48:25 +0200 Subject: [PATCH 2/3] VSTS-192 - Add coverage to CI --- .travis.yml | 2 +- package-lock.json | 29 ++++++++++++++--------------- package.json | 20 +++++++++----------- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43f2356f..5473dd88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ cache: install: - npm install - npm run install-dep -before_script: npm run clean && npm run validate +before_script: npm run clean && npm run validate-ci script: - if [ -n "$ARTIFACTORY_URL" ]; then npm run deploy; fi - git fetch --unshallow && npm run sonarqube diff --git a/package-lock.json b/package-lock.json index f6e6eb0a..030dba9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6285,6 +6285,12 @@ "merge-stream": "^1.0.1" } }, + "jju": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", + "integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=", + "dev": true + }, "js-beautify": { "version": "1.8.9", "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.9.tgz", @@ -8766,13 +8772,13 @@ } }, "sonarqube-scanner": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/sonarqube-scanner/-/sonarqube-scanner-2.1.2.tgz", - "integrity": "sha512-4Sf01R7zOnR3YTofaQI5HH6UTz46l0kUov7cJvWmhD9Hi+U16komI/e61GjOyC2JrVrFiWqFsO/o15ceHbKd/Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/sonarqube-scanner/-/sonarqube-scanner-2.5.0.tgz", + "integrity": "sha512-8pDYXZSnCml0MFjBoeMjhAeV+AIS6XqWN0nkwFmwB/Md2WtDQgag4wDIvAnn5fjZzH1k92E2zWZwLi6sb6HveA==", "dev": true, "requires": { "download": "7.0.0", - "extend": "3.0.1", + "extend": "3.0.2", "fancy-log": "^1.1.0", "lodash.get": "^4.4.2", "lodash.uniq": "^4.5.0", @@ -8780,14 +8786,6 @@ "progress": "^2.0.0", "read-pkg": "2.0.0", "slugify": "1.3.1" - }, - "dependencies": { - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "dev": true - } } }, "sort-keys": { @@ -9361,9 +9359,9 @@ "dev": true }, "tfx-cli": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/tfx-cli/-/tfx-cli-0.7.6.tgz", - "integrity": "sha512-Eav/kscIuizZzMPcxao3vO72b+v9oamjL5NGiJx2g4noUgmP6b2CYDreCGCKzPydcCVhUNcW6O8fRRXYe+O2FA==", + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/tfx-cli/-/tfx-cli-0.7.8.tgz", + "integrity": "sha512-1jwJnu6ixYSstBDXXyPkBDkhNeTOVvLOhbtCDGKwCsmsWhQe/KUTFHaBlmi8y/tqg7/xI8A1cji5pM9C+3qKzg==", "dev": true, "requires": { "app-root-path": "1.0.0", @@ -9373,6 +9371,7 @@ "clipboardy": "~1.2.3", "colors": "~1.3.0", "glob": "7.1.2", + "jju": "^1.4.0", "json-in-place": "^1.0.1", "jszip": "~3.1.5", "lodash": "~4.17.11", diff --git a/package.json b/package.json index 9ad6d4b8..2abcd576 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "prettier": "1.12.1", "request": "2.85.0", "semver": "5.5.0", - "sonarqube-scanner": "2.1.2", - "tfx-cli": "^0.7.6", + "sonarqube-scanner": "^2.5.0", + "tfx-cli": "^0.7.8", "tmp": "0.0.33", "ts-jest": "22.4.4", "typescript": "2.8.3", @@ -53,9 +53,10 @@ "lint-report": "eslint --ext js,ts -f json -o eslint-report.json \"{common,extensions}/**/*.{js,ts}\"", "test-build": "./node_modules/.bin/gulp build:test", "test": "./node_modules/.bin/jest", + "test-ci": "./node_modules/.bin/jest --coverage", "ts-check": "./node_modules/.bin/tsc --noEmit", "validate": "npm run lint && npm run ts-check && npm run format-check && npm run test", - "validate-ci": "npm run lint-report && npm run ts-check && npm run format-check && npm run test --ci --coverage --runInBand" + "validate-ci": "npm run lint-report && npm run ts-check && npm run format-check && npm run test-ci" }, "engines": { "node": ">=6" @@ -63,15 +64,12 @@ "jest": { "clearMocks": true, "collectCoverageFrom": [ - "**/*.ts" + "{common}**/*.ts" ], - "coveragePathIgnorePatterns": [ - "gulpfile.js", - "__tests__/", - "/node_modules", - "/config", - "/scripts", - "/build" + "coverageDirectory": "/coverage", + "coverageReporters": [ + "lcovonly", + "text" ], "moduleFileExtensions": [ "ts", From 9187a1010465ea5c4a69b5fc05f91a7f66493223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl?= Date: Wed, 31 Jul 2019 07:37:15 +0200 Subject: [PATCH 3/3] fixup! fixed dependencies on sonarqube scanner and tfx cli + Added coverage exclusion to extensions folder. --- config/utils.js | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/utils.js b/config/utils.js index 073becbd..2685e4a3 100644 --- a/config/utils.js +++ b/config/utils.js @@ -139,7 +139,7 @@ exports.runSonnarQubeScanner = function(callback, options = {}) { 'sonar.exclusions': 'build/**, coverage/**, node_modules/**, **/node_modules/**, **/__tests__/**', 'sonar.coverage.exclusions': - 'gulpfile.js, build/**, config/**, coverage/**, scripts/**, **/__tests__/**', + 'gulpfile.js, build/**, config/**, coverage/**, extensions/**, scripts/**, **/__tests__/**', 'sonar.tests': '.', 'sonar.test.inclusions': '**/__tests__/**', 'sonar.analysis.buildNumber': process.env.TRAVIS_BUILD_NUMBER, diff --git a/package.json b/package.json index 2abcd576..31f3a00d 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "prettier": "1.12.1", "request": "2.85.0", "semver": "5.5.0", - "sonarqube-scanner": "^2.5.0", - "tfx-cli": "^0.7.8", + "sonarqube-scanner": "2.5.0", + "tfx-cli": "0.7.8", "tmp": "0.0.33", "ts-jest": "22.4.4", "typescript": "2.8.3",