diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 74026e2f56..24c5d29c4f 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -165,44 +165,48 @@ stages: - task: Npm@1 displayName: npm install (AcceptanceTest) inputs: - workingDir: - - task: PowerShell@2 + workingDir: 'src\Umbraco.Tests.AcceptanceTest' + - task: Npm@1 displayName: Run Cypress (Desktop) inputs: - targetType: 'inline' - errorActionPreference: 'continue' - workingDirectory: 'src\Umbraco.Tests.AcceptanceTest' - script: | - npx cypress run --reporter=junit --reporter-options="mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="videoUploadOnPasses=false,viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos" - - task: PowerShell@2 + workingDir: src\Umbraco.Tests.AcceptanceTest + command: 'custom' + customCommand: 'run test -- --reporter=junit --reporter-options="mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="videoUploadOnPasses=false,viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos"' + - task: PublishTestResults@2 + displayName: Publish Test results (Desktop) + inputs: + testResultsFormat: 'JUnit' + testResultsFiles: 'results/test-output-D-*.xml' + mergeTestResults: true + testRunTitle: "Test results Desktop" + - task: Npm@1 displayName: Run Cypress (Tablet portrait) inputs: - targetType: 'inline' - errorActionPreference: 'continue' - workingDirectory: 'src\Umbraco.Tests.AcceptanceTest' - script: | - npx cypress run --reporter=junit --reporter-options="mochaFile=results/test-output-T-[hash].xml,toConsole=true" --config="videoUploadOnPasses=false,viewportHeight=1366,viewportWidth=1024,screenshotsFolder=cypress/artifacts/tablet/screenshots,videosFolder=cypress/artifacts/tablet/videos" - - task: PowerShell@2 + workingDir: src\Umbraco.Tests.AcceptanceTest + command: 'custom' + customCommand: 'run test -- --reporter=junit --reporter-options="mochaFile=results/test-output-T-[hash].xml,toConsole=true" --config="videoUploadOnPasses=false,viewportHeight=1366,viewportWidth=1024,screenshotsFolder=cypress/artifacts/tablet/screenshots,videosFolder=cypress/artifacts/tablet/videos"' + - task: PublishTestResults@2 + displayName: Publish Test results (Tablet portrait) + inputs: + testResultsFormat: 'JUnit' + testResultsFiles: 'results/test-output-T-*.xml' + mergeTestResults: true + testRunTitle: "Test results Tablet portrait" + - task: Npm@1 displayName: Run Cypress (Mobile protrait) inputs: - targetType: 'inline' - errorActionPreference: 'continue' - workingDirectory: 'src\Umbraco.Tests.AcceptanceTest' - script: | - npx cypress run --reporter=junit --reporter-options="mochaFile=results/test-output-M-[hash].xml,toConsole=true" --config="videoUploadOnPasses=false,viewportHeight=812,viewportWidth=375,screenshotsFolder=cypress/artifacts/mobile/screenshots,videosFolder=cypress/artifacts/mobile/videos" + workingDir: src\Umbraco.Tests.AcceptanceTest + command: 'custom' + customCommand: 'run test -- --reporter-options="mochaFile=results/test-output-M-[hash].xml,toConsole=true" --config="videoUploadOnPasses=false,viewportHeight=812,viewportWidth=375,screenshotsFolder=cypress/artifacts/mobile/screenshots,videosFolder=cypress/artifacts/mobile/videos"' + - task: PublishTestResults@2 + displayName: Publish Test results (Mobile portrait) inputs: testResultsFormat: 'JUnit' testResultsFiles: 'results/test-output-M-*.xml' mergeTestResults: true testRunTitle: "Test results Mobile" - # - task: Npm@1 - # displayName: npm run test (AcceptanceTest) - # inputs: - # workingDir: src\Umbraco.Tests.AcceptanceTest - # command: 'custom' - # customCommand: 'run test' - + - stage: Artifacts dependsOn: [] jobs: