Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion tests/e2e/pageObjects/browser-page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -948,8 +948,14 @@ export class BrowserPage extends InstancePage {
*/
async selectIndexByName(index: string): Promise<void> {
const option = Selector(`[data-test-subj="mode-option-type-${index}"]`);
const placeholder = Selector('[data-testid="select-index-placeholder"]');
const dropdown = Selector('[data-testid="select-search-mode"]');

// Click placeholder if it exists, otherwise click dropdown
const triggerElement = await placeholder.exists ? placeholder : dropdown;

await t
.click(this.selectIndexDdn)
.click(triggerElement)
.click(option);
}

Expand Down
8 changes: 5 additions & 3 deletions tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export class AddRedisDatabaseDialog {
// BUTTONS
addDatabaseButton = Selector('[data-testid^=add-redis-database]');
addRedisDatabaseButton = Selector('[data-testid=btn-submit]');
addRedisDatabaseButtonHover = Selector('[data-testid=btn-submit]').parent();
customSettingsButton = Selector('[data-testid=btn-connection-settings]');
addAutoDiscoverDatabase = Selector('[data-testid=add-database_tab_software]');
addCloudDatabaseButton = Selector('[data-testid=create-free-db-btn]');
Expand All @@ -27,6 +28,7 @@ export class AddRedisDatabaseDialog {
cloneDatabaseButton = Selector('[data-testid=clone-db-btn]');
cancelButton = Selector('[data-testid=btn-cancel]');
testConnectionBtn = Selector('[data-testid=btn-test-connection]');
testConnectionBtnHover = Selector('[data-testid=btn-test-connection]').parent();
backButton = Selector('[data-testid=back-btn]');
generalTab = Selector('[data-testid=manual-form-tab-general]');
securityTab = Selector('[data-testid=manual-form-tab-security]');
Expand Down Expand Up @@ -61,14 +63,14 @@ export class AddRedisDatabaseDialog {
selectCompressor = Selector('[data-testid=select-compressor]', { timeout: 1000 });
certificateDropdownList = Selector('div.euiSuperSelect__listbox div');
// CHECKBOXES
useSSHCheckbox = Selector('[data-testid=use-ssh]~div', { timeout: 500 });
useSSHCheckbox = Selector('[data-testid=use-ssh] ~ label', { timeout: 500 });
dataCompressorCheckbox = Selector('[data-testid=showCompressor] ~ label');
requiresTlsClientCheckbox = Selector('[data-testid=tls-required-checkbox] ~ label');
useCloudAccount = Selector('#cloud-account').parent();
useCloudKeys = Selector('#cloud-api-keys').parent();
// RADIO BUTTONS
sshPasswordRadioBtn = Selector('#password~div', { timeout: 500 });
sshPrivateKeyRadioBtn = Selector('#privateKey~div', { timeout: 500 });
sshPasswordRadioBtn = Selector('[for="password"]', { timeout: 500 });
sshPrivateKeyRadioBtn = Selector('[for="privateKey"]', { timeout: 500 });
cloudOptionsRadioBtn = Selector('[data-testid=cloud-options]');
// LABELS
dataCompressorLabel = Selector('[data-testid=showCompressor] ~ label', { timeout: 1000 });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ test
.click(myRedisDatabasePage.AddRedisDatabaseDialog.securityTab)
.click(myRedisDatabasePage.AddRedisDatabaseDialog.useSSHCheckbox)
.click(myRedisDatabasePage.AddRedisDatabaseDialog.sshPrivateKeyRadioBtn)
.hover(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton);
.hover(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButtonHover);
for (const text of tooltipText) {
await browserActions.verifyTooltipContainsText(text, true);
}
// Verify that user can see the Test Connection button enabled/disabled with the same rules as the button to add/apply the changes
await t.hover(myRedisDatabasePage.AddRedisDatabaseDialog.testConnectionBtn);
await t.hover(myRedisDatabasePage.AddRedisDatabaseDialog.testConnectionBtnHover);
for (const text of tooltipText) {
await browserActions.verifyTooltipContainsText(text, true);
}
Expand Down
Loading