refactor tests

Author: pettinarip

tests/e2e/global.spec.ts

@@ -15,7 +15,7 @@ test.describe("Global", () => {
       // Try invalid search queries
       await homePage.search(testData.search.invalidQuery)
 
-      // Should not crash or show errors, has to show no results
+      // Should not crash or show errors, has to show the no results message
       await page.waitForTimeout(1000) // Allow search to process
 
       await homePage.verifyNoResults()
@@ -65,21 +65,9 @@ test.describe("Global", () => {
       ).toBeVisible()
     }
 
-    test("switches to Chinese (desktop)", async ({ page }) => {
-      const isMobile = await homePage.isMobileViewport()
-      test.skip(isMobile, "This test is for desktop viewports only")
-
-      await expect(page).toHaveURL(`/${DEFAULT_LOCALE}/`)
-      await homePage.openLanguagePickerDesktop()
-      await switchToChinese(page, homePage)
-    })
-
-    test("switches to Chinese (mobile)", async ({ page }) => {
-      const isMobile = await homePage.isMobileViewport()
-      test.skip(!isMobile, "This test is for mobile viewports only")
-
+    test("switches to Chinese", async ({ page }) => {
       await expect(page).toHaveURL(`/${DEFAULT_LOCALE}/`)
-      await homePage.openLanguagePickerMobile()
+      await homePage.openLanguagePicker()
       await switchToChinese(page, homePage)
     })
   })
@@ -113,7 +101,7 @@ test.describe("Global", () => {
 
       await homePage.assertUrlMatches(`/${DEFAULT_LOCALE}/`)
 
-      await homePage.openLanguagePickerDesktop()
+      await homePage.openLanguagePicker()
       await switchToArabic(page, homePage)
 
       await homePage.assertUrlMatches(/\/ar(\/|$)/)

tests/e2e/home.spec.ts

@@ -25,7 +25,6 @@ test.describe("Home Page", () => {
   })
 
   test("main navigation - desktop", async () => {
-    // Only run this test for desktop projects
     const isMobile = await homePage.isMobileViewport()
     test.skip(isMobile, "This test is for desktop viewports only")
 

tests/e2e/pages/BasePage.ts

@@ -128,6 +128,27 @@ export class BasePage {
     await this.mobileSidebar.getByRole("button", { name: /languages/i }).click()
   }
 
+  /**
+   * Open language picker
+   */
+  async openLanguagePicker(): Promise<void> {
+    const isMobile = await this.isMobileViewport()
+    if (isMobile) {
+      await this.openLanguagePickerMobile()
+    } else {
+      await this.openLanguagePickerDesktop()
+    }
+  }
+
+  async getSearchButton(): Promise<Locator> {
+    const isMobile = await this.isMobileViewport()
+    if (isMobile) {
+      return this.searchButtonMobile
+    } else {
+      return this.searchInputButton
+    }
+  }
+
   /**
    * Switch to a specific language
    */

tests/e2e/pages/HomePage.ts

@@ -32,13 +32,8 @@ export class HomePage extends BasePage {
    * Perform a search action
    */
   async search(query: string) {
-    const isMobile = await this.isMobileViewport()
-
-    if (isMobile) {
-      await this.searchButtonMobile.first().click()
-    } else {
-      await this.searchInputButton.first().click()
-    }
+    const searchBtn = await this.getSearchButton()
+    await searchBtn.click()
 
     await this.searchInput.fill(query)
   }