From eddeee573f55fa5c4541222779885a8e58cd576c Mon Sep 17 00:00:00 2001
From: Olga Bulat <obulat@gmail.com>
Date: Thu, 5 Oct 2023 07:18:02 +0300
Subject: [PATCH] Remove searchBy from tests

---
 .../e2e/filters-sidebar-keyboard.spec.ts         |  5 ++---
 frontend/test/playwright/e2e/filters.spec.ts     | 16 +++++-----------
 .../playwright/e2e/search-query-server.spec.ts   |  6 +++---
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/frontend/test/playwright/e2e/filters-sidebar-keyboard.spec.ts b/frontend/test/playwright/e2e/filters-sidebar-keyboard.spec.ts
index 7220a837650..bb203c64d5c 100644
--- a/frontend/test/playwright/e2e/filters-sidebar-keyboard.spec.ts
+++ b/frontend/test/playwright/e2e/filters-sidebar-keyboard.spec.ts
@@ -35,9 +35,8 @@ for (const dir of languageDirections) {
       await setBreakpointCookie(page, "lg")
       /**
        * To simplify finding the last focusable element in the filters sidebar,
-       * we use the image search page. After the removal of the "searchBy" filter,
-       * the last element on the all media search page is the "license explanation"
-       * button, not a checkbox.
+       * we use the image search page. The last element on the all media search
+       * page is the "license explanation" button, not a checkbox.
        */
       await page.goto(pathWithDir("/search/image?q=birds", dir))
     })
diff --git a/frontend/test/playwright/e2e/filters.spec.ts b/frontend/test/playwright/e2e/filters.spec.ts
index 1f221135cd3..9308aa45379 100644
--- a/frontend/test/playwright/e2e/filters.spec.ts
+++ b/frontend/test/playwright/e2e/filters.spec.ts
@@ -63,9 +63,7 @@ breakpoints.describeMobileAndDesktop(() => {
   }
 
   test("initial filters are applied based on the url", async ({ page }) => {
-    await page.goto(
-      "/search/?q=cat&license_type=commercial&license=cc0&searchBy=creator"
-    )
+    await page.goto("/search/?q=cat&license_type=commercial&license=cc0")
     await filters.open(page)
     // Creator filter was removed from the UI
     const expectedFilters = ["Zero", "Use commercially"]
@@ -78,9 +76,7 @@ breakpoints.describeMobileAndDesktop(() => {
   test("common filters are retained when media type changes from all media to single type", async ({
     page,
   }) => {
-    await page.goto(
-      "/search/?q=cat&license_type=commercial&license=cc0&searchBy=creator"
-    )
+    await page.goto("/search/?q=cat&license_type=commercial&license=cc0")
     await filters.open(page)
     // Creator filter was removed from the UI
     const expectedFilters = ["Zero", "Use commercially"]
@@ -91,7 +87,7 @@ breakpoints.describeMobileAndDesktop(() => {
     await changeSearchType(page, IMAGE)
 
     await expect(page).toHaveURL(
-      "/search/image?q=cat&license_type=commercial&license=cc0&searchBy=creator"
+      "/search/image?q=cat&license_type=commercial&license=cc0"
     )
     await filters.open(page)
     for (const checkbox of expectedFilters) {
@@ -102,9 +98,7 @@ breakpoints.describeMobileAndDesktop(() => {
   test("common filters are retained when media type changes from single type to all media", async ({
     page,
   }) => {
-    await page.goto(
-      "/search/image?q=cat&license_type=commercial&license=cc0&searchBy=creator"
-    )
+    await page.goto("/search/image?q=cat&license_type=commercial&license=cc0")
     await filters.open(page)
 
     // Creator filter was removed from the UI
@@ -118,7 +112,7 @@ breakpoints.describeMobileAndDesktop(() => {
     await expect(page.locator('input[type="checkbox"]:checked')).toHaveCount(2)
 
     await expect(page).toHaveURL(
-      "/search/?q=cat&license_type=commercial&license=cc0&searchBy=creator"
+      "/search/?q=cat&license_type=commercial&license=cc0"
     )
   })
 
diff --git a/frontend/test/playwright/e2e/search-query-server.spec.ts b/frontend/test/playwright/e2e/search-query-server.spec.ts
index 81f3ccf24e1..b60e5de21ae 100644
--- a/frontend/test/playwright/e2e/search-query-server.spec.ts
+++ b/frontend/test/playwright/e2e/search-query-server.spec.ts
@@ -34,7 +34,7 @@ test.describe("search query on SSR", () => {
 
     test("q query parameter is set as the search term", async ({ page }) => {
       await goToSearchTerm(page, "cat", {
-        query: "license=cc0&license_type=commercial&searchBy=creator",
+        query: "license=cc0&license_type=commercial",
       })
 
       const searchInput = page.locator('input[type="search"]')
@@ -66,7 +66,7 @@ test.describe("search query on SSR", () => {
       page,
     }) => {
       await goToSearchTerm(page, "cat", {
-        query: "license=cc0&license_type=commercial&searchBy=creator",
+        query: "license=cc0&license_type=commercial",
       })
 
       await filters.open(page)
@@ -83,7 +83,7 @@ test.describe("search query on SSR", () => {
     }) => {
       await goToSearchTerm(page, "cat", {
         searchType: IMAGE,
-        query: "searchBy=creator&extension=jpg,png,gif,svg",
+        query: "extension=jpg,png,gif,svg",
       })
       await filters.open(page)
       const checkboxes = ["JPEG", "PNG", "GIF", "SVG"]