diff --git a/.github/workflows/frontend-tests.yaml b/.github/workflows/frontend-tests.yaml index 9c6fc23bc..032acf150 100644 --- a/.github/workflows/frontend-tests.yaml +++ b/.github/workflows/frontend-tests.yaml @@ -28,13 +28,13 @@ jobs: uses: 'actions/upload-artifact@v4' with: name: 'playwright-screenshots' - path: 'src/typescript/screenshots/' + path: 'src/typescript/frontend/screenshots/' - if: '${{ !cancelled() }}' name: 'Upload Playwright report as artifact' uses: 'actions/upload-artifact@v4' with: name: 'playwright-report' - path: 'src/typescript/playwright-report/' + path: 'src/typescript/frontend/playwright-report/' retention-days: 30 timeout-minutes: 15 name: 'Run the frontend tests' diff --git a/src/typescript/frontend/.eslintrc.js b/src/typescript/frontend/.eslintrc.js index 46734c91f..6a41e681a 100644 --- a/src/typescript/frontend/.eslintrc.js +++ b/src/typescript/frontend/.eslintrc.js @@ -35,7 +35,7 @@ module.exports = { }, ecmaVersion: "latest", sourceType: "module", - project: ["tsconfig.json"], + project: ["tsconfig.json", "tests/tsconfig.json"], warnOnUnsupportedTypeScriptVersion: false, }, plugins: ["@typescript-eslint", "import", "prettier"], diff --git a/src/typescript/frontend/.gitignore b/src/typescript/frontend/.gitignore index 9de0974cb..c5ec732bf 100644 --- a/src/typescript/frontend/.gitignore +++ b/src/typescript/frontend/.gitignore @@ -52,3 +52,6 @@ yarn.lock /playwright-report/ /blob-report/ /playwright/.cache/ + +screenshots +playwright-report diff --git a/src/typescript/frontend/tests/e2e/market-order.spec.ts b/src/typescript/frontend/tests/e2e/market-order.spec.ts index c10528d88..2bdf913a3 100644 --- a/src/typescript/frontend/tests/e2e/market-order.spec.ts +++ b/src/typescript/frontend/tests/e2e/market-order.spec.ts @@ -78,7 +78,7 @@ test("check sorting order", async ({ page }) => { await bumpOrder.waitFor({ state: "visible", timeout: 5000 }); expect(bumpOrder).toBeVisible(); - await page.screenshot({ path: "screenshots/test-failure.png" }); + await page.screenshot({ path: "screenshots/market-order-1.png" }); // Sort by bump order. await bumpOrder.click(); @@ -86,7 +86,7 @@ test("check sorting order", async ({ page }) => { // Expect the markets to be in bump order. marketGridItems = page.locator("#emoji-grid a").getByTitle(/RAT,/); await marketGridItems.first().waitFor({ state: "visible", timeout: 5000 }); - await page.screenshot({ path: "screenshots/test-failure-2.png" }); + await page.screenshot({ path: "screenshots/market-order-2.png" }); expect(marketGridItems.first()).toBeVisible(); expect(marketGridItems).toHaveText(patterns.reverse()); }); diff --git a/src/typescript/frontend/tests/tsconfig.json b/src/typescript/frontend/tests/tsconfig.json new file mode 100644 index 000000000..c30c5f46b --- /dev/null +++ b/src/typescript/frontend/tests/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "../tsconfig.json", + "include": [ + "**/*.ts", + "../playwright.config.ts" + ] +} diff --git a/src/typescript/frontend/tsconfig.json b/src/typescript/frontend/tsconfig.json index f1a2f479d..8b30e81e8 100644 --- a/src/typescript/frontend/tsconfig.json +++ b/src/typescript/frontend/tsconfig.json @@ -69,7 +69,6 @@ "./src/**/*.ts", "./src/**/*.tsx", ".next/types/**/*.ts", - "./dist/types/**/*.ts", - "playwright.config.ts" + "./dist/types/**/*.ts" ] }