diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 58b9c90f9..ceac6a17c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,50 +26,51 @@ resources: type: github name: Safelite/AzureDevOps endpoint: Safelite - ref: refs/tags/t5.3.3 + ref: DigitalConsumer variables: - group: Digital-Infrastructure stages: # PR's - # - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - # - stage: TestPr - # displayName: Run Unit Tests For PullRequest - # jobs: - # - template: templates/digital/vue-jest-run-unit-tests.yml@AzureDevOps - # parameters: - # nodeContainer: node - # npmLocation: $(Build.SourcesDirectory) - # testResultsFile: junit.xml - # summaryFileLocation: coverage/cobertura-coverage.xml + - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - stage: TestPr + displayName: Run Unit Tests For PullRequest + jobs: + - template: templates/digital/vue-jest-run-unit-tests.yml@AzureDevOps + parameters: + nodeContainer: node + npmLocation: $(Build.SourcesDirectory) + testResultsFile: junit.xml + summaryFileLocation: $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml # Dev Build/Deploy - - stage: Dev - variables: - - group: FixMyGlassDev - jobs: - - deployment: devBuildDeployment - displayName: Build and Deploy FMG - Dev - environment: digitalCloud-dev - container: node - workspace: - clean: all - strategy: - runOnce: - deploy: - steps: - - checkout: self - clean: true - - template: templates/digital/step-build-vue.yml@AzureDevOps - parameters: - buildOutputDir: dist - - template: templates/digital/step-deploy-vue.yml@AzureDevOps - parameters: - artifactName: vueDist - awsProfile: $(devDeploymentProfile) - deployBuckets: - safelite-dev-fmg-us-east-1: - clearFolder: true - deployFolder: '' - region: us-east-1 + - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - stage: Dev + variables: + - group: FixMyGlassDev + jobs: + - deployment: devBuildDeployment + displayName: Build and Deploy FMG - Dev + environment: digitalCloud-dev + container: node + workspace: + clean: all + strategy: + runOnce: + deploy: + steps: + - checkout: self + clean: true + - template: templates/digital/step-build-vue.yml@AzureDevOps + parameters: + buildOutputDir: dist + - template: templates/digital/step-deploy-vue.yml@AzureDevOps + parameters: + artifactName: vueDist + awsProfile: $(devDeploymentProfile) + deployBuckets: + safelite-dev-fmg-us-east-1: + clearFolder: true + deployFolder: '' + region: us-east-1 diff --git a/package.json b/package.json index f5b242812..2017e3fbb 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "serve": "vue-cli-service serve", "build": "vue-cli-service build", "lint": "vue-cli-service lint", - "test:unit": "vue-cli-service test:unit --coverage --coverageReporters=cobertura --ci --watchAll=false" + "test:unit": "vue-cli-service test:unit --coverage --coverageReporters=cobertura --coverageReporters=html --ci --watchAll=false --reporters=jest-junit --reporters=default" }, "dependencies": { "bootstrap": "^5.1.1", diff --git a/src/App.vue b/src/App.vue index 1982e117d..6bd10e98d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,7 +12,7 @@