Fixes after review

saleor · Jan 31, 2024 · ae9fd28 · ae9fd28
1 parent 61cc591
commit ae9fd28
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/.github/actions/run-pw-tests/action.yml b/.github/actions/run-pw-tests/action.yml
@@ -19,6 +19,10 @@ inputs:
   SHARD:
     description: "Shard number"
     required: true
+  MAILPITURL:
+    description: "mailpit uri"
+    required: true
+
 runs:
   using: "composite"
   steps:
@@ -43,6 +47,7 @@ runs:
         E2E_USER_PASSWORD: ${{ inputs.E2E_USER_PASSWORD }}
         E2E_PERMISSIONS_USERS_PASSWORD: ${{ inputs.E2E_PERMISSIONS_USERS_PASSWORD }}
         SHARD_NUMBER: ${{ inputs.SHARD }}
+        MAILPITURL: ${{ inputs.MAILPITURL }} 
       run: npm run qa:pw-e2e -- --shard "$SHARD_NUMBER"
 
     - name: Upload blob report to GitHub Actions Artifacts

diff --git a/.github/workflows/pr-automation.yml b/.github/workflows/pr-automation.yml
@@ -208,6 +208,7 @@ jobs:
           E2E_USER_NAME: ${{ secrets.CYPRESS_USER_NAME }}
           E2E_USER_PASSWORD: ${{ secrets.CYPRESS_USER_PASSWORD }}
           E2E_PERMISSIONS_USERS_PASSWORD: ${{ secrets.CYPRESS_PERMISSIONS_USERS_PASSWORD }}
+          MAILPITURL: ${{ secrets.CYPRESS_MAILPITURL }}
 
   merge-reports:
     if: '!cancelled()'

diff --git a/playwright/pages/dialogs/exportGiftCardsDialog.ts b/playwright/pages/dialogs/exportGiftCardsDialog.ts
@@ -11,5 +11,6 @@ export class ExportGiftCardsDialog {
     const fileExtensionCheckbox = this.page.getByTestId(fileExtension);
     await fileExtensionCheckbox.click();
     await this.submitButton.click();
+    await this.submitButton.waitFor({state: "hidden"})
   }
 }
diff --git a/playwright/pages/giftCardsPage.ts b/playwright/pages/giftCardsPage.ts
@@ -5,8 +5,8 @@ import { ResendGiftCardCodeDialog } from "@dialogs/resendGiftCardCodeDialog";
 import { MetadataSeoPage } from "@pageElements/metadataSeoPage";
 import { BasePage } from "@pages/basePage";
 import type { Page } from "@playwright/test";
-import { ExportGiftCardsDialog } from "./dialogs/exportGiftCardsDialog";
-import { SetGiftCardsBalanceDialog } from "./dialogs/setGiftCardBalanceDialog";
+import { ExportGiftCardsDialog } from "@dialogs/exportGiftCardsDialog";
+import { SetGiftCardsBalanceDialog } from "@dialogs/setGiftCardBalanceDialog";
 
 export class GiftCardsPage extends BasePage {
   readonly page: Page;

diff --git a/playwright/tests/girftCards.spec.ts b/playwright/tests/girftCards.spec.ts
@@ -6,8 +6,10 @@ import { MailpitService } from "@api/mailpit";
 
 test.use({ storageState: "playwright/.auth/admin.json" });
 let giftCardsPage: GiftCardsPage;
-test.beforeEach(({ page }) => {
+let mailpitService: MailpitService;
+test.beforeEach(({ page, request }) => {
   giftCardsPage = new GiftCardsPage(page);
+  mailpitService = new MailpitService(request);
 });
 
 test("TC: SALEOR_105 Issue gift card @e2e @gift", async () => {
@@ -108,23 +110,19 @@ test("TC: SALEOR_112 Set gift card balance @e2e @gift", async () => {
   await giftCardsPage.setGiftCardsBalanceDialog.setBalance("34")
   await giftCardsPage.expectSuccessBanner();
 });
-test("TC: SALEOR_113 Export gift card codes in XLSX file @e2e @gift", async ({request}) => {
+test("TC: SALEOR_113 Export gift card codes in XLSX file @e2e @gift", async () => {
   await giftCardsPage.gotoGiftCardsListView();
   await giftCardsPage.clickExportGiftCards();
   await giftCardsPage.exportGiftCardsDialog.exportGiftCardCodes("XLSX");
-  const mailpitService = new MailpitService(request);
   await mailpitService.checkDoesUserReceivedExportedData(
     process.env.E2E_USER_NAME!,
     "Your exported gift cards data is ready",
   );
 });
-test("TC: SALEOR_114 Export gift card codes in CSV file @e2e @gift", async ({
-  request,
-}) => {
+test("TC: SALEOR_114 Export gift card codes in CSV file @e2e @gift", async () => {
   await giftCardsPage.gotoGiftCardsListView();
   await giftCardsPage.clickExportGiftCards();
   await giftCardsPage.exportGiftCardsDialog.exportGiftCardCodes("CSV");
-  const mailpitService = new MailpitService(request);
   await mailpitService.checkDoesUserReceivedExportedData(
     process.env.E2E_USER_NAME!,
     "Your exported gift cards data is ready",