From 25024f08404b1e83b9ee605a6bcab609ed81218f Mon Sep 17 00:00:00 2001 From: mariasergeenko Date: Fri, 6 Dec 2024 13:41:29 +0100 Subject: [PATCH 1/6] fix for some locators --- .../dialogs/add-redis-database-dialog.ts | 15 +++++++-------- .../user-agreements-form.e2e.ts | 2 +- .../critical-path/database/add-ssh-db.e2e.ts | 2 +- .../user-agreements-form.e2e.ts | 2 +- .../database/connecting-to-the-db.e2e.ts | 4 ++-- .../web/smoke/database/add-standalone-db.e2e.ts | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts index ad7eaafb10..28c71463c0 100644 --- a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts +++ b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts @@ -14,10 +14,10 @@ export class AddRedisDatabaseDialog { // BUTTONS addDatabaseButton = Selector('[data-testid^=add-redis-database]'); addRedisDatabaseButton = Selector('[data-testid=btn-submit]'); - addDatabaseManually = Selector('[data-testid=add-database_tab_manual]'); + customSettingsButton = Selector('[data-testid=btn-connection-settings]'); addAutoDiscoverDatabase = Selector('[data-testid=add-database_tab_software]'); addCloudDatabaseTab = Selector('[data-testid=add-database_tab_cloud]'); - redisClusterType = Selector('[data-test-subj=radio-btn-enterprise-cluster]'); + redisSotfwareButton = Selector('[data-testid=option-btn-software]'); redisCloudProType = Selector('[data-test-subj=radio-btn-cloud-pro]'); redisSentinelType = Selector('[data-test-subj=radio-btn-sentinel]'); showDatabasesButton = Selector('[data-testid=btn-show-databases]'); @@ -84,7 +84,7 @@ export class AddRedisDatabaseDialog { await this.addDatabaseButton.with({ visibilityCheck: true, timeout: 10000 })(); await t .click(this.addDatabaseButton) - .click(this.addDatabaseManually); + .click(this.customSettingsButton); await t .typeText(this.hostInput, parameters.host, { replace: true, paste: true }) @@ -107,7 +107,7 @@ export class AddRedisDatabaseDialog { await t .click(this.addDatabaseButton) - .click(this.addDatabaseManually); + .click(this.customSettingsButton); await t .typeText(this.hostInput, parameters.host, { replace: true, paste: true }) @@ -135,7 +135,7 @@ export class AddRedisDatabaseDialog { await t .click(this.addDatabaseButton) - .click(this.addDatabaseManually); + .click(this.customSettingsButton); await t .typeText(this.hostInput, databaseParameters.host, { replace: true, paste: true }) @@ -202,9 +202,8 @@ export class AddRedisDatabaseDialog { await t .click(this.addDatabaseButton) - .click(this.addAutoDiscoverDatabase); - await t.click(this.redisClusterType); + await t.click(this.redisSotfwareButton); await t .typeText(this.hostInput, parameters.host, { replace: true, paste: true }) .typeText(this.portInput, parameters.port, { replace: true, paste: true }) @@ -235,7 +234,7 @@ export class AddRedisDatabaseDialog { await t .click(this.addDatabaseButton) - .click(this.addDatabaseManually); + .click(this.customSettingsButton); if (!!parameters.ossClusterHost) { await t.typeText(this.hostInput, parameters.ossClusterHost, { replace: true, paste: true }); diff --git a/tests/e2e/tests/electron/critical-path/a-first-start-form/user-agreements-form.e2e.ts b/tests/e2e/tests/electron/critical-path/a-first-start-form/user-agreements-form.e2e.ts index 0bfd626a13..50faeec5fd 100644 --- a/tests/e2e/tests/electron/critical-path/a-first-start-form/user-agreements-form.e2e.ts +++ b/tests/e2e/tests/electron/critical-path/a-first-start-form/user-agreements-form.e2e.ts @@ -15,7 +15,7 @@ test('Verify that user should accept User Agreements to continue working with th await t.expect(userAgreementDialog.userAgreementsPopup.exists).ok('User Agreements Popup is shown'); // Verify that I still has agreements popup & cannot add a database await t.expect(userAgreementDialog.submitButton.hasAttribute('disabled')).ok('Submit button not disabled by default'); - await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseManually.exists).notOk('User can\'t add a database'); + await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.customSettingsButton.exists).notOk('User can\'t add a database'); }); test('Verify that the encryption enabled by default and specific message', async t => { const expectedPluginText = 'To avoid automatic execution of malicious code, when adding new Workbench plugins, use files from trusted authors only.'; diff --git a/tests/e2e/tests/electron/critical-path/database/add-ssh-db.e2e.ts b/tests/e2e/tests/electron/critical-path/database/add-ssh-db.e2e.ts index f524428805..d8cc66e565 100644 --- a/tests/e2e/tests/electron/critical-path/database/add-ssh-db.e2e.ts +++ b/tests/e2e/tests/electron/critical-path/database/add-ssh-db.e2e.ts @@ -70,7 +70,7 @@ test('Adding database with SSH', async t => { // Verify that if user have not entered any required value he can see that this field should be specified when hover over the button to add a database await t .click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton) - .click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseManually) + .click(myRedisDatabasePage.AddRedisDatabaseDialog.customSettingsButton) .click(myRedisDatabasePage.AddRedisDatabaseDialog.useSSHCheckbox) .click(myRedisDatabasePage.AddRedisDatabaseDialog.sshPrivateKeyRadioBtn) .hover(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton); diff --git a/tests/e2e/tests/web/critical-path/a-first-start-form/user-agreements-form.e2e.ts b/tests/e2e/tests/web/critical-path/a-first-start-form/user-agreements-form.e2e.ts index b3e1833a0d..552ef9bf30 100644 --- a/tests/e2e/tests/web/critical-path/a-first-start-form/user-agreements-form.e2e.ts +++ b/tests/e2e/tests/web/critical-path/a-first-start-form/user-agreements-form.e2e.ts @@ -19,7 +19,7 @@ test('Verify that user should accept User Agreements to continue working with th await t.expect(userAgreementDialog.userAgreementsPopup.exists).ok('User Agreements Popup is shown'); // Verify that I still has agreements popup & cannot add a database await t.expect(userAgreementDialog.submitButton.hasAttribute('disabled')).ok('Submit button not disabled by default'); - await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseManually.exists).notOk('User can\'t add a database'); + await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.customSettingsButton.exists).notOk('User can\'t add a database'); }); test('Verify that the encryption enabled by default and specific message', async t => { const expectedPluginText = 'To avoid automatic execution of malicious code, when adding new Workbench plugins, use files from trusted authors only.'; diff --git a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts index 5241f87e5e..0c4b716871 100644 --- a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts +++ b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts @@ -68,7 +68,7 @@ test await t .click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton) - .click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseManually); + .click(myRedisDatabasePage.AddRedisDatabaseDialog.customSettingsButton); // Verify that the Host, Port, Database Alias values pre-populated by default for the manual flow await t @@ -113,7 +113,7 @@ test await t .click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton) - .click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseManually); + .click(myRedisDatabasePage.AddRedisDatabaseDialog.customSettingsButton); await t .click(myRedisDatabasePage.AddRedisDatabaseDialog.useSSHCheckbox) diff --git a/tests/e2e/tests/web/smoke/database/add-standalone-db.e2e.ts b/tests/e2e/tests/web/smoke/database/add-standalone-db.e2e.ts index 0c57940312..8c92f86132 100644 --- a/tests/e2e/tests/web/smoke/database/add-standalone-db.e2e.ts +++ b/tests/e2e/tests/web/smoke/database/add-standalone-db.e2e.ts @@ -54,7 +54,7 @@ test await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton); // Verify that telemetry event 'CONFIG_DATABASES_CLICKED' sent and has all expected properties await telemetry.verifyEventHasProperties(telemetryEvents[1], clickButtonExpectedProperties, logger); - await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseManually); + await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.customSettingsButton); await t .typeText(myRedisDatabasePage.AddRedisDatabaseDialog.hostInput, ossStandaloneConfig.host, { replace: true, paste: true }) .typeText(myRedisDatabasePage.AddRedisDatabaseDialog.portInput, ossStandaloneConfig.port, { replace: true, paste: true }) From 8c2682e1a7530602f795cc9cc87c49161385d1bd Mon Sep 17 00:00:00 2001 From: mariasergeenko Date: Fri, 6 Dec 2024 17:13:54 +0100 Subject: [PATCH 2/6] add test --- .../dialogs/add-redis-database-dialog.ts | 1 + .../database/connecting-to-the-db.e2e.ts | 43 ++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts index 28c71463c0..40ea040887 100644 --- a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts +++ b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts @@ -55,6 +55,7 @@ export class AddRedisDatabaseDialog { sshPrivateKeyInput = Selector('[data-testid=sshPrivateKey]'); sshPassphraseInput = Selector('[data-testid=sshPassphrase]'); timeoutInput = Selector('[data-testid=timeout]'); + urlInput = Selector('[data-testid=connection-url]'); // DROPDOWNS caCertField = Selector('[data-testid=select-ca-cert]', { timeout: 500 }); clientCertField = Selector('[data-testid=select-cert]', { timeout: 500 }); diff --git a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts index 0c4b716871..622dc7150e 100644 --- a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts +++ b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts @@ -1,18 +1,31 @@ import { rte } from '../../../../helpers/constants'; import { BrowserPage, MyRedisDatabasePage } from '../../../../pageObjects'; -import { commonUrl, invalidOssStandaloneConfig, ossClusterForSSHConfig, ossStandaloneForSSHConfig } from '../../../../helpers/conf'; +import { + commonUrl, + invalidOssStandaloneConfig, + ossClusterForSSHConfig, + ossStandaloneForSSHConfig, + ossStandaloneRedisGears, +} from '../../../../helpers/conf'; import { DatabaseHelper } from '../../../../helpers/database'; import { DatabaseAPIRequests } from '../../../../helpers/api/api-database'; import { sshPrivateKey, sshPrivateKeyWithPasscode } from '../../../../test-data/sshPrivateKeys'; import { Common } from '../../../../helpers/common'; import { BrowserActions } from '../../../../common-actions/browser-actions'; import { goBackHistory } from '../../../../helpers/utils'; +import { t } from 'testcafe'; +import { AddRedisDatabaseDialog } from '../../../../pageObjects/dialogs'; const myRedisDatabasePage = new MyRedisDatabasePage(); const browserPage = new BrowserPage(); const databaseHelper = new DatabaseHelper(); const databaseAPIRequests = new DatabaseAPIRequests(); const browserActions = new BrowserActions(); +const addDbDialog = new AddRedisDatabaseDialog(); + +const { host, port, databaseName, databaseUsername = '', databasePassword = '' } = ossStandaloneRedisGears; +const username = 'alice&&'; +const password = 'p1pp0@&'; const sshParams = { sshHost: '172.31.100.245', @@ -206,3 +219,31 @@ test await Common.checkURL(externalPageLinkNavigation); await goBackHistory(); }); +test.only + .meta({ rte: rte.none }) + .before(async t => { + await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneRedisGears); + await browserPage.Cli.sendCommandInCli(`acl DELUSER ${username}`); + await browserPage.Cli.sendCommandInCli(`ACL SETUSER ${username} on >${password} +@all ~*`); + await t.click(browserPage.NavigationPanel.myRedisDBButton); + }) + .after(async t => { + // Delete all existing connections + await t.click(addDbDialog.cancelButton); + await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton); + await myRedisDatabasePage.clickOnDBByName(databaseName); + await browserPage.Cli.sendCommandInCli(`acl DELUSER ${username}`); + await databaseAPIRequests.deleteAllDatabasesApi(); + }) + ('Verify that inserted URL is parsed', async t => { + const codedUrl = `redis://${username}:${password}@${host}:${port}`; + await t + .click(addDbDialog.addDatabaseButton); + await t.typeText(addDbDialog.urlInput, codedUrl); + await t.click(addDbDialog.customSettingsButton); + await t.expect(addDbDialog.databaseAliasInput.getAttribute('value')).eql(`${host}:${port}`, 'name is incorrected'); + await t.expect(addDbDialog.hostInput.getAttribute('value')).eql(`${host}`, 'host is incorrected'); + await t.expect(addDbDialog.portInput.getAttribute('value')).eql(`${port}`, 'port is incorrected'); + await t.expect(addDbDialog.usernameInput.getAttribute('value')).eql(`${username}`, 'username is incorrected'); + await t.expect(addDbDialog.passwordInput.getAttribute('value')).eql(`${password}`, 'username is incorrected'); + }); From 2684ddbbea9c368023c283df5756165e311ee722 Mon Sep 17 00:00:00 2001 From: mariasergeenko Date: Mon, 9 Dec 2024 13:00:56 +0100 Subject: [PATCH 3/6] remove only --- .../web/critical-path/database/connecting-to-the-db.e2e.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts index 622dc7150e..e0d136822a 100644 --- a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts +++ b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts @@ -13,7 +13,6 @@ import { sshPrivateKey, sshPrivateKeyWithPasscode } from '../../../../test-data/ import { Common } from '../../../../helpers/common'; import { BrowserActions } from '../../../../common-actions/browser-actions'; import { goBackHistory } from '../../../../helpers/utils'; -import { t } from 'testcafe'; import { AddRedisDatabaseDialog } from '../../../../pageObjects/dialogs'; const myRedisDatabasePage = new MyRedisDatabasePage(); @@ -96,7 +95,7 @@ test .expect(myRedisDatabasePage.AddRedisDatabaseDialog.hostInput.value).eql(defaultHost, 'Default sentinel host not prepopulated') .expect(myRedisDatabasePage.AddRedisDatabaseDialog.portInput.value).eql(defaultSentinelPort, 'Default sentinel port not prepopulated'); }); -test +test.only .meta({ rte: rte.standalone }) .after(async() => { // Delete databases @@ -219,7 +218,7 @@ test await Common.checkURL(externalPageLinkNavigation); await goBackHistory(); }); -test.only +test .meta({ rte: rte.none }) .before(async t => { await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneRedisGears); From 074a17ec3f257f7f70d3cb1d9a068e14ca347945 Mon Sep 17 00:00:00 2001 From: mariasergeenko Date: Mon, 9 Dec 2024 16:10:58 +0100 Subject: [PATCH 4/6] fix for tests#1 --- tests/e2e/pageObjects/my-redis-databases-page.ts | 2 +- .../web/critical-path/database/connecting-to-the-db.e2e.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/pageObjects/my-redis-databases-page.ts b/tests/e2e/pageObjects/my-redis-databases-page.ts index 69fcef375f..98dcf006e5 100644 --- a/tests/e2e/pageObjects/my-redis-databases-page.ts +++ b/tests/e2e/pageObjects/my-redis-databases-page.ts @@ -38,7 +38,7 @@ export class MyRedisDatabasePage extends BaseOverviewPage { sortByDatabaseAlias = Selector('span').withAttribute('title', 'Database Alias'); sortByHostAndPort = Selector('span').withAttribute('title', 'Host:Port'); sortByConnectionType = Selector('span').withAttribute('title', 'Connection Type'); - importDatabasesBtn = Selector('[data-testid=add-database_tab_import]'); + importDatabasesBtn = Selector('[data-testid=option-btn-import]'); retryImportBtn = Selector('[data-testid=btn-retry]'); submitImportBtn = Selector('[data-testid=submit-btn]'); removeImportedFileBtn = Selector('[aria-label="Clear selected files"]'); diff --git a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts index e0d136822a..8cd0a1abd9 100644 --- a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts +++ b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts @@ -95,7 +95,7 @@ test .expect(myRedisDatabasePage.AddRedisDatabaseDialog.hostInput.value).eql(defaultHost, 'Default sentinel host not prepopulated') .expect(myRedisDatabasePage.AddRedisDatabaseDialog.portInput.value).eql(defaultSentinelPort, 'Default sentinel port not prepopulated'); }); -test.only +test .meta({ rte: rte.standalone }) .after(async() => { // Delete databases From af489f09da1b513b95ab476b269d76791b9d2221 Mon Sep 17 00:00:00 2001 From: mariasergeenko Date: Tue, 10 Dec 2024 09:40:23 +0100 Subject: [PATCH 5/6] fix for tests#2 --- .../e2e/pageObjects/dialogs/add-redis-database-dialog.ts | 9 ++++----- .../tests/electron/regression/database/cloud-sso.e2e.ts | 2 +- .../critical-path/database/connecting-to-the-db.e2e.ts | 2 +- tests/e2e/tests/web/regression/database/cloud-sso.e2e.ts | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts index 40ea040887..69909dbb9b 100644 --- a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts +++ b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts @@ -16,10 +16,10 @@ export class AddRedisDatabaseDialog { addRedisDatabaseButton = Selector('[data-testid=btn-submit]'); customSettingsButton = Selector('[data-testid=btn-connection-settings]'); addAutoDiscoverDatabase = Selector('[data-testid=add-database_tab_software]'); - addCloudDatabaseTab = Selector('[data-testid=add-database_tab_cloud]'); + addCloudDatabaseButton = Selector('[data-testid=create-free-db-btn]'); redisSotfwareButton = Selector('[data-testid=option-btn-software]'); redisCloudProType = Selector('[data-test-subj=radio-btn-cloud-pro]'); - redisSentinelType = Selector('[data-test-subj=radio-btn-sentinel]'); + redisSentinelButton = Selector('[data-test-subj=option-btn-sentinel]'); showDatabasesButton = Selector('[data-testid=btn-show-databases]'); databaseName = Selector('.euiTableCellContent.column_name'); selectAllCheckbox = Selector('[data-test-subj=checkboxSelectAll]'); @@ -181,9 +181,8 @@ export class AddRedisDatabaseDialog { await t .click(this.addDatabaseButton) - .click(this.addAutoDiscoverDatabase); - await t.click(this.redisSentinelType); + await t.click(this.redisSentinelButton); if (!!parameters.sentinelHost) { await t.typeText(this.hostInput, parameters.sentinelHost, { replace: true, paste: true }); } @@ -220,7 +219,7 @@ export class AddRedisDatabaseDialog { await t .click(this.addDatabaseButton) - .click(this.addCloudDatabaseTab); + .click(this.addCloudDatabaseButton); await t .typeText(this.accessKeyInput, cloudAPIAccessKey, { replace: true, paste: true }) diff --git a/tests/e2e/tests/electron/regression/database/cloud-sso.e2e.ts b/tests/e2e/tests/electron/regression/database/cloud-sso.e2e.ts index a557e8903e..3938ffc49e 100644 --- a/tests/e2e/tests/electron/regression/database/cloud-sso.e2e.ts +++ b/tests/e2e/tests/electron/regression/database/cloud-sso.e2e.ts @@ -49,7 +49,7 @@ test('Verify that user can see SSO feature if it is enabled in feature config', // await t.click(myRedisDatabasePage.Modal.closeModalButton); await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton); - await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.addCloudDatabaseTab); + await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.addCloudDatabaseButton); // Verify that RE Cloud auto-discovery options Use Cloud Account and Use Cloud API Keys are displayed on Welcome screen await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.useCloudAccount.exists).ok('Use Cloud Account accordion not displayed when SSO feature enabled'); await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.useCloudKeys.exists).ok('Use Cloud Keys accordion not displayed when SSO feature enabled'); diff --git a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts index 8cd0a1abd9..0da66ce1fd 100644 --- a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts +++ b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts @@ -90,7 +90,7 @@ test // Verify that the Host, Port, Database Alias values pre-populated by default for Sentinel await t .click(myRedisDatabasePage.AddRedisDatabaseDialog.addAutoDiscoverDatabase) - .click(myRedisDatabasePage.AddRedisDatabaseDialog.redisSentinelType); + .click(myRedisDatabasePage.AddRedisDatabaseDialog.redisSentinelButton); await t .expect(myRedisDatabasePage.AddRedisDatabaseDialog.hostInput.value).eql(defaultHost, 'Default sentinel host not prepopulated') .expect(myRedisDatabasePage.AddRedisDatabaseDialog.portInput.value).eql(defaultSentinelPort, 'Default sentinel port not prepopulated'); diff --git a/tests/e2e/tests/web/regression/database/cloud-sso.e2e.ts b/tests/e2e/tests/web/regression/database/cloud-sso.e2e.ts index 7ed3b04416..1ac3d7d313 100644 --- a/tests/e2e/tests/web/regression/database/cloud-sso.e2e.ts +++ b/tests/e2e/tests/web/regression/database/cloud-sso.e2e.ts @@ -40,7 +40,7 @@ test('Verify that user can not see the promo Cloud databases for docker build', await t.click( myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton); await t.click( - myRedisDatabasePage.AddRedisDatabaseDialog.addCloudDatabaseTab); + myRedisDatabasePage.AddRedisDatabaseDialog.addCloudDatabaseButton); await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.useCloudAccount.exists).notOk('Use Cloud Account accordion displayed for docker build'); await t.expect(myRedisDatabasePage.AddRedisDatabaseDialog.useCloudKeys.exists).notOk('Use Cloud Keys accordion displayed for docker build'); }); From c559da272716e6dbb19387690871a6df8f156d38 Mon Sep 17 00:00:00 2001 From: mariasergeenko Date: Tue, 10 Dec 2024 11:18:36 +0100 Subject: [PATCH 6/6] fix for tests#2 --- tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts index 69909dbb9b..7573063e4e 100644 --- a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts +++ b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts @@ -18,19 +18,14 @@ export class AddRedisDatabaseDialog { addAutoDiscoverDatabase = Selector('[data-testid=add-database_tab_software]'); addCloudDatabaseButton = Selector('[data-testid=create-free-db-btn]'); redisSotfwareButton = Selector('[data-testid=option-btn-software]'); - redisCloudProType = Selector('[data-test-subj=radio-btn-cloud-pro]'); - redisSentinelButton = Selector('[data-test-subj=option-btn-sentinel]'); + redisSentinelButton = Selector('[data-testid=option-btn-sentinel]'); showDatabasesButton = Selector('[data-testid=btn-show-databases]'); databaseName = Selector('.euiTableCellContent.column_name'); selectAllCheckbox = Selector('[data-test-subj=checkboxSelectAll]'); databaseIndexCheckbox = Selector('[data-testid=showDb]~div', { timeout: 500 }); - connectToDatabaseButton = Selector('[data-testid=connect-to-db-btn]'); connectToRedisStackButton = Selector('[aria-label="Connect to database"]'); cloneDatabaseButton = Selector('[data-testid=clone-db-btn]'); - sentinelNavigation = Selector('[data-testid=sentinel-nav-group]'); - sentinelDatabaseNavigation = Selector('[data-testid=database-nav-group]'); cancelButton = Selector('[data-testid=btn-cancel]'); - showPasswordBtn = Selector('[aria-label^="Show password"]'); testConnectionBtn = Selector('[data-testid=btn-test-connection]'); // TEXT INPUTS (also referred to as 'Text fields')