From ac427e4253e1145a11af29882c93c9c553e26511 Mon Sep 17 00:00:00 2001
From: Elena Baidakova <elena@ghost.org>
Date: Fri, 10 Mar 2023 13:19:24 +0400
Subject: [PATCH] Removed explicit timeout for offer creation helper

refs TryGhost/Team#2667
- Removed timeout to make it the same as a global one
---
 ghost/admin/app/templates/offers.hbs                 |  1 +
 .../core/test/e2e-browser/utils/e2e-browser-utils.js | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ghost/admin/app/templates/offers.hbs b/ghost/admin/app/templates/offers.hbs
index 1d5b240ac6..d59d6d6cdd 100644
--- a/ghost/admin/app/templates/offers.hbs
+++ b/ghost/admin/app/templates/offers.hbs
@@ -14,6 +14,7 @@
                             @triggerClass="gh-contentfilter-menu-trigger"
                             @dropdownClass="gh-contentfilter-menu-dropdown"
                             @matchTriggerWidth={{false}}
+                            data-testid="offers-type-select"
                             as |type|
                         >
                             {{#if type.name}}{{type.name}} offers{{else}}<span class="red">Unknown type</span>{{/if}}
diff --git a/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js b/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
index f79ebed38f..1ffb6b60bc 100644
--- a/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
+++ b/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js
@@ -295,13 +295,11 @@ const createOffer = async (page, {name, tierName, offerType, amount, discountTyp
             .getByRole('button', {name: 'Archive'})
             .click();
 
-        // TODO: Use a more resilient selector
-        const statusDropdown = await page.getByRole('button', {name: 'Archived offers'});
-        await statusDropdown.waitFor({
-            state: 'visible',
-            timeout: 1000
-        });
-        await statusDropdown.click();
+        // waiting for offer to be archived
+        await expect(await page.locator('.modal-content')).toBeHidden();
+
+        await expect(await page.getByTestId('offers-type-select')).toBeVisible();
+        await page.getByTestId('offers-type-select').click();
         await page.getByRole('option', {name: 'Active offers'}).click();
     }