updated azure pipelines

jinwenming · Jan 9, 2020 · 9fc9381 · 9fc9381
1 parent efb23d8
commit 9fc9381
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 21 deletions.
diff --git a/azure-pipelines.pr.yml b/azure-pipelines.pr.yml
@@ -55,13 +55,55 @@ jobs:
           command: install
           workingDir: src/Frontend/Jp.AdminUI
 
+      - task: Npm@1
+        displayName: 'NPM - Test - AdminUI'
+        inputs:
+          command: custom
+          customCommand: 'run test -- --watch=false --code-coverage'
+          workingDir: src/Frontend/Jp.AdminUI
+
+      - task: Npm@1
+        displayName: 'NPM - E2E - AdminUI'
+        inputs:
+          command: custom
+          customCommand: 'run e2e'
+          workingDir: src/Frontend/Jp.AdminUI 
+
+      - task: CmdLine@2
+        displayName: 'Create Code coverage report'
+        inputs:
+          script: |
+            dotnet tool install -g dotnet-reportgenerator-globaltool 
+                    reportgenerator "-reports:./**/coverage.cobertura.xml;./**/cobertura-coverage.xml" "-targetdir:./src/CodeCoverage" "-reporttypes:HtmlInline_AzurePipelines_Dark;Cobertura;Badges"
+
       - task: Npm@1
         displayName: 'NPM - Build Prod - AdminUI'
         inputs:
           command: custom
           customCommand: 'run build'
           workingDir: src/Frontend/Jp.AdminUI
 
+      - task: PublishCodeCoverageResults@1
+        displayName: 'Publish code coverage from ./src/CodeCoverage/Cobertura.xml'
+        inputs:
+          codeCoverageTool: Cobertura
+          summaryFileLocation: './src/CodeCoverage/Cobertura.xml'
+          reportDirectory: './src/CodeCoverage'
+
+      - task: PublishTestResults@2
+        displayName: 'Publish Angular test results'
+        inputs:
+          testRunTitle: Angular
+          testResultsFormat: JUnit
+          testResultsFiles: "**/TESTS*.xml"
+
+      - task: PublishTestResults@2
+        displayName: 'Publish Angular E2E test results'
+        inputs:
+          testRunTitle: Angular_E2E
+          testResultsFormat: JUnit
+          testResultsFiles: "**/junit*.xml"             
+
   - job: 'docker'
     displayName: 'Docker files'
     pool:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -82,6 +82,27 @@ jobs:
           command: install
           workingDir: src/Frontend/Jp.AdminUI
 
+      - task: Npm@1
+        displayName: 'NPM - Test - AdminUI'
+        inputs:
+          command: custom
+          customCommand: 'run test -- --watch=false --code-coverage'
+          workingDir: src/Frontend/Jp.AdminUI
+
+      - task: Npm@1
+        displayName: 'NPM - E2E - AdminUI'
+        inputs:
+          command: custom
+          customCommand: 'run e2e'
+          workingDir: src/Frontend/Jp.AdminUI 
+
+      - task: CmdLine@2
+        displayName: 'Create Code coverage report'
+        inputs:
+          script: |
+            dotnet tool install -g dotnet-reportgenerator-globaltool 
+                    reportgenerator "-reports:./**/coverage.cobertura.xml;./**/cobertura-coverage.xml" "-targetdir:./src/CodeCoverage" "-reporttypes:HtmlInline_AzurePipelines_Dark;Cobertura;Badges"
+
       - task: Npm@1
         displayName: 'NPM - Build Prod - AdminUI'
         inputs:
@@ -104,3 +125,25 @@ jobs:
           PathtoPublish: '$(Build.ArtifactStagingDirectory)/jpproject.admin-ui.$(Build.BuildNumber).zip'
           ArtifactName: 'jpproject.admin-ui.$(Build.BuildNumber)'
           publishLocation: 'Container'
+
+      - task: PublishCodeCoverageResults@1
+        displayName: 'Publish code coverage from ./src/CodeCoverage/Cobertura.xml'
+        inputs:
+          codeCoverageTool: Cobertura
+          summaryFileLocation: './src/CodeCoverage/Cobertura.xml'
+          reportDirectory: './src/CodeCoverage'
+
+
+      - task: PublishTestResults@2
+        displayName: 'Publish Angular test results'
+        inputs:
+          testRunTitle: Angular
+          testResultsFormat: JUnit
+          testResultsFiles: "**/TESTS*.xml"
+
+      - task: PublishTestResults@2
+        displayName: 'Publish Angular E2E test results'
+        inputs:
+          testRunTitle: Angular_E2E
+          testResultsFormat: JUnit
+          testResultsFiles: "**/junit*.xml"            
diff --git a/src/Frontend/Jp.AdminUI/e2e/protractor.conf.js b/src/Frontend/Jp.AdminUI/e2e/protractor.conf.js
@@ -1,28 +1,28 @@
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/lib/config.ts
 
+// https://github.com/angular/protractor/blob/master/lib/config.ts
 const { SpecReporter } = require('jasmine-spec-reporter');
-
+const { JUnitXmlReporter } = require('jasmine-reporters');
+process.env.CHROME_BIN = require("puppeteer").executablePath();
 exports.config = {
   allScriptsTimeout: 30000,
-  specs: [
     './*.e2e-spec.ts'
   ],
   capabilities: {
-    'browserName': 'chrome'
+    'browserName': 'chrome',
+    chromeOptions: {
+      args: ["--headless", "--disable-gpu", "--window-size=1200,900"],
+      binary: process.env.CHROME_BIN
+    }
   },
   directConnect: true,
   baseUrl: 'http://localhost:4200/',
-  framework: 'jasmine',
-  jasmineNodeOpts: {
-    showColors: true,
-    defaultTimeoutInterval: 30000,
-    print: function() {}
-  },
-  onPrepare() {
-    require('ts-node').register({
       project: 'e2e/tsconfig.e2e.json'
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+    var junitReporter = new JUnitXmlReporter({
+      savePath: require('path').join(__dirname, './junit'),
+      consolidateAll: true
+    });
+    jasmine.getEnv().addReporter(junitReporter);
   }
 };
diff --git a/src/Frontend/Jp.AdminUI/karma.conf.js b/src/Frontend/Jp.AdminUI/karma.conf.js
@@ -2,6 +2,9 @@
 // https://karma-runner.github.io/1.0/config/configuration-file.html
 
 module.exports = function (config) {
+  const puppeteer = require('puppeteer');
+  process.env.CHROME_BIN = puppeteer.executablePath();
+
   config.set({
     basePath: '',
     frameworks: ['jasmine', '@angular-devkit/build-angular'],
@@ -10,7 +13,8 @@ module.exports = function (config) {
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage-istanbul-reporter'),
-      require('@angular-devkit/build-angular/plugins/karma')
+      require('@angular-devkit/build-angular/plugins/karma'),
+      require('karma-junit-reporter')
     ],
     client:{
       clearContext: false // leave Jasmine Spec Runner output visible in browser
@@ -27,15 +31,18 @@ module.exports = function (config) {
       environment: 'dev'
     },
     coverageIstanbulReporter: {
-      reports: ['html', 'lcovonly', 'text-summary'],
+      dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly', 'text-summary', 'cobertura' ],
       fixWebpackSourcePaths: true
     },
-    reporters: ['progress', 'kjhtml'],
+    reporters: ['progress', 'kjhtml', 'junit'],
+    junitReporter: {
+      outputDir: '../junit'
+    },
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['Chrome'],
+    browsers: ['ChromeHeadless'],
     singleRun: false,
     restartOnFileChange: true
   });

diff --git a/src/Frontend/Jp.AdminUI/package.json b/src/Frontend/Jp.AdminUI/package.json
@@ -9,12 +9,13 @@
     "install": "npm run napa",
     "start": "ng serve --port 4300",
     "build": "ng build --prod",
-    "test": "ng test",
+    "install-puppeteer": "cd node_modules/puppeteer && npm run install",
+    "test": "npm run install-puppeteer && ng test",
     "lint": "ng lint",
     "lintfix": "ng lint --fix=true",
     "modernizr": "modernizr -c modernizr-config.json -d src/modernizr.js",
     "postinstall": "node ./node_modules/protractor/bin/webdriver-manager update",
-    "e2e": "ng e2e",
+    "e2e": "npm run install-puppeteer && ng e2e",
     "napa": "napa"
   },
   "private": true,

diff --git a/src/Frontend/Jp.AdminUI/src/app/app.component.spec.ts b/src/Frontend/Jp.AdminUI/src/app/app.component.spec.ts
@@ -9,7 +9,7 @@ import { LayoutModule } from "./shared/layout/layout.module";
 import { SharedModule } from "./shared/shared.module";
 import { APP_BASE_HREF } from "@angular/common";
 import { RoutesModule } from "./app.routing.module";
-import { HttpClientModule } from "@angular/common/http";
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 describe("App: JpProject", () => {
     beforeEach(() => {
@@ -21,7 +21,7 @@ describe("App: JpProject", () => {
                 AppComponent
             ],
             imports: [
-                HttpClientModule,
+                HttpClientTestingModule,
                 TranslateModule.forRoot(),
                 CoreModule,
                 LayoutModule,