Merge pull request #4218 from RedisInsight/e2e/bugfix/fixes-for-e2e-release

E2e/bugfix/fixes for e2e release

Author: vlad-dargel

tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts

@@ -27,6 +27,7 @@ export class AddRedisDatabaseDialog {
     cloneDatabaseButton = Selector('[data-testid=clone-db-btn]');
     cancelButton = Selector('[data-testid=btn-cancel]');
     testConnectionBtn = Selector('[data-testid=btn-test-connection]');
+    backButton = Selector('[data-testid=back-btn]');
 
     // TEXT INPUTS (also referred to as 'Text fields')
     disabledDatabaseInfo = Selector('[class=euiListGroupItem__label]');
@@ -35,7 +36,7 @@ export class AddRedisDatabaseDialog {
     databaseAliasInput = Selector('[data-testid=name]');
     passwordInput = Selector('[data-testid=password]');
     usernameInput = Selector('[data-testid=username]');
-    connectionUrlInput = Selector('[data-testid=connectionURL]');
+    connectionUrlInput = Selector('[data-testid=connection-url]');
     accessKeyInput = Selector('[data-testid=access-key]');
     secretKeyInput = Selector('[data-testid=secret-key]');
     databaseIndexInput = Selector('[data-testid=db]');

tests/e2e/tests/electron/critical-path/database/add-ssh-db.e2e.ts

@@ -122,7 +122,8 @@ test('Adding database with SSH', async t => {
     await myRedisDatabasePage.clickOnDBByName(sshDbPasscode.databaseName);
     await Common.checkURLContainsText('browser');
 });
-test('Verify that  OSS Cluster database with SSH can be added and work correctly', async t => {
+// Unskip after fixing RI-6386
+test.skip('Verify that OSS Cluster database with SSH can be added and work correctly', async t => {
     const sshWithPass = {
         ...sshParams,
         sshPassword: 'pass'

tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts

@@ -89,7 +89,7 @@ test
             .expect(myRedisDatabasePage.AddRedisDatabaseDialog.databaseAliasInput.value).eql(`${defaultHost}:${defaultPort}`, 'Default db alias not prepopulated');
         // Verify that the Host, Port, Database Alias values pre-populated by default for Sentinel
         await t
-            .click(myRedisDatabasePage.AddRedisDatabaseDialog.addAutoDiscoverDatabase)
+            .click(myRedisDatabasePage.AddRedisDatabaseDialog.backButton)
             .click(myRedisDatabasePage.AddRedisDatabaseDialog.redisSentinelButton);
         await t
             .expect(myRedisDatabasePage.AddRedisDatabaseDialog.hostInput.value).eql(defaultHost, 'Default sentinel host not prepopulated')
@@ -195,13 +195,13 @@ test
         await myRedisDatabasePage.clickOnDBByName(sshDbPass.databaseName);
         await Common.checkURLContainsText('browser');
     });
-test
+// Unskip in RI-6478
+test.skip
     .meta({ rte: rte.none })
     .before(async() => {
         await databaseAPIRequests.deleteAllDatabasesApi();
         await databaseHelper.acceptLicenseTerms();
     })('Verify that create free cloud db is displayed always', async t => {
-
         const externalPageLinkList = 'https://redis.io/try-free?utm_source=redisinsight&utm_medium=app&utm_campaign=list_of_databases';
         const externalPageLinkNavigation = 'https://redis.io/try-free?utm_source=redisinsight&utm_medium=app&utm_campaign=navigation_menu';