From 71f6b30b039ea8ab345c18e648e35950db1268ee Mon Sep 17 00:00:00 2001 From: Ubax Date: Fri, 15 Mar 2024 07:38:07 +0100 Subject: [PATCH 1/4] feat: Adds task-4 solution --- .github/workflows/task-4.yaml | 36 +++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/task-4.yaml diff --git a/.github/workflows/task-4.yaml b/.github/workflows/task-4.yaml new file mode 100644 index 0000000..1ba07b4 --- /dev/null +++ b/.github/workflows/task-4.yaml @@ -0,0 +1,36 @@ +name: task-4-workflow +run-name: Task 4 workflow +on: + pull_request: + branches: + - main + paths: + - "desktop-app/**" + +defaults: + run: + working-directory: desktop-app +jobs: + e2e-tests: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Use Node.js LTS + uses: actions/setup-node@v3 + with: + node-version: "lts/*" + cache: "npm" + cache-dependency-path: desktop-app + - name: Install dependencies + run: npm install + - name: Run e2e tests + id: e2e + run: npm run e2e + - name: Archive test results + if: ${{ failure() && steps.e2e.conclusion == 'failure' }} + uses: actions/upload-artifact@v2 + with: + name: e2e-test-results + path: desktop-app/test-results + retention-days: 7 \ No newline at end of file From ae1ab778574dcca436e6959ae80e73888abbcdae Mon Sep 17 00:00:00 2001 From: Ubax Date: Fri, 15 Mar 2024 07:50:24 +0100 Subject: [PATCH 2/4] fix: Adds xvfb-run to e2e --- .github/workflows/task-4.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/task-4.yaml b/.github/workflows/task-4.yaml index 1ba07b4..4b21d8f 100644 --- a/.github/workflows/task-4.yaml +++ b/.github/workflows/task-4.yaml @@ -26,7 +26,7 @@ jobs: run: npm install - name: Run e2e tests id: e2e - run: npm run e2e + run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run e2e - name: Archive test results if: ${{ failure() && steps.e2e.conclusion == 'failure' }} uses: actions/upload-artifact@v2 From 9287f1233155ef51970deb4bfd766c3833414bc8 Mon Sep 17 00:00:00 2001 From: Ubax Date: Fri, 15 Mar 2024 08:05:38 +0100 Subject: [PATCH 3/4] chore: Adds URL to results to steps --- .github/workflows/task-4.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/task-4.yaml b/.github/workflows/task-4.yaml index 4b21d8f..dab848e 100644 --- a/.github/workflows/task-4.yaml +++ b/.github/workflows/task-4.yaml @@ -17,20 +17,22 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - name: Use Node.js LTS - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: "lts/*" cache: "npm" cache-dependency-path: desktop-app - name: Install dependencies - run: npm install + run: npm ci - name: Run e2e tests id: e2e run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run e2e - name: Archive test results if: ${{ failure() && steps.e2e.conclusion == 'failure' }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: e2e-test-results path: desktop-app/test-results - retention-days: 7 \ No newline at end of file + retention-days: 7 + - run: echo 'Screenshots available "at ${{ steps.artifact-upload-step.outputs.artifact-url }}' + if: ${{ failure() && steps.e2e.conclusion == 'failure' }} \ No newline at end of file From 2dec4ce1defbb84243069ed1f1ff9e6416e3c9fb Mon Sep 17 00:00:00 2001 From: Ubax Date: Fri, 15 Mar 2024 07:38:45 +0100 Subject: [PATCH 4/4] chore: Breaks sum e2e test --- desktop-app/src/e2e/sum.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-app/src/e2e/sum.test.ts b/desktop-app/src/e2e/sum.test.ts index 1c2f9a3..1adb772 100644 --- a/desktop-app/src/e2e/sum.test.ts +++ b/desktop-app/src/e2e/sum.test.ts @@ -6,7 +6,7 @@ electronTest.afterEach(saveScreenshotOnFailure('sum')) electronTest("With no numbers the result is 0", async ({ page }) => { const result = await page.getByTestId("result") - expect(await result.innerText()).toBe("0") + expect(await result.innerText()).toBe("1") }) electronTest("With only first number changed returns first number", async ({ page }) => {