Skip to content

Commit 57a595a

Browse files
committed
chore(e2e): update helper commands to account for search bar being on screen when loading connections
1 parent d1001b6 commit 57a595a

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

packages/compass-e2e-tests/helpers/commands/connect.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,12 @@ export async function waitForConnectionResult(
134134
): Promise<string | undefined> {
135135
const waitOptions = typeof timeout !== 'undefined' ? { timeout } : undefined;
136136

137-
if (await browser.$(Selectors.SidebarFilterInput).isDisplayed()) {
137+
if (
138+
(await browser.$(Selectors.SidebarFilterInput).isDisplayed()) &&
139+
(await browser
140+
.$(Selectors.SidebarFilterInput)
141+
.getAttribute('aria-disabled')) !== 'true'
142+
) {
138143
// Clear the filter to make sure every connection shows
139144
await browser.clickVisible(Selectors.SidebarFilterInput);
140145
await browser.setValueVisible(Selectors.SidebarFilterInput, '');

packages/compass-e2e-tests/helpers/commands/disconnect.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ async function resetForDisconnect(
1515
// and therefore be rendered.
1616
await browser.clickVisible(Selectors.CollapseConnectionsButton);
1717

18-
if (await browser.$(Selectors.SidebarFilterInput).isDisplayed()) {
18+
if (
19+
(await browser.$(Selectors.SidebarFilterInput).isDisplayed()) &&
20+
(await browser
21+
.$(Selectors.SidebarFilterInput)
22+
.getAttribute('aria-disabled')) !== 'true'
23+
) {
1924
// Clear the filter to make sure every connection shows
2025
await browser.clickVisible(Selectors.SidebarFilterInput);
2126
await browser.setValueVisible(Selectors.SidebarFilterInput, '');

packages/compass-e2e-tests/helpers/commands/remove-connections.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ async function resetForRemove(browser: CompassBrowser) {
88
// and therefore be rendered.
99
await browser.clickVisible(Selectors.CollapseConnectionsButton);
1010

11-
if (await browser.$(Selectors.SidebarFilterInput).isDisplayed()) {
11+
if (
12+
(await browser.$(Selectors.SidebarFilterInput).isDisplayed()) &&
13+
(await browser
14+
.$(Selectors.SidebarFilterInput)
15+
.getAttribute('aria-disabled')) !== 'true'
16+
) {
1217
// Clear the filter to make sure every connection shows
1318
await browser.clickVisible(Selectors.SidebarFilterInput);
1419
await browser.setValueVisible(Selectors.SidebarFilterInput, '');

packages/compass-e2e-tests/helpers/commands/sidebar-connection.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,12 @@ export async function removeConnection(
9393
connectionName: string
9494
): Promise<boolean> {
9595
// make sure there's no filter because if the connection is not displayed then we can't remove it
96-
if (await browser.$(Selectors.SidebarFilterInput).isExisting()) {
96+
if (
97+
(await browser.$(Selectors.SidebarFilterInput).isExisting()) &&
98+
(await browser
99+
.$(Selectors.SidebarFilterInput)
100+
.getAttribute('aria-disabled')) !== 'true'
101+
) {
97102
await browser.clickVisible(Selectors.SidebarFilterInput);
98103
await browser.setValueVisible(Selectors.SidebarFilterInput, '');
99104

0 commit comments

Comments
 (0)