Merge pull request #4224 from RedisInsight/e2e/feature/RI-6386-fix-e2e-cluster-ssh-config

RI-6386 fix e2e oss cluster ssh config and tests

Author: mariasergeenko

tests/e2e/helpers/conf.ts

@@ -142,11 +142,11 @@ export const ossStandaloneForSSHConfig = {
 };
 
 export const ossClusterForSSHConfig = {
-    host: process.env.OSS_STANDALONE_SSH_HOST || '172.33.100.211',
-    port: process.env.OSS_STANDALONE_SSH_PORT || '6379',
-    databaseName: `${process.env.OSS_STANDALONE_SSH_DATABASE_NAME || 'oss-cluster-for-ssh'}-${uniqueId}`,
-    databaseUsername: process.env.OSS_STANDALONE_SSH_USERNAME,
-    databasePassword: process.env.OSS_STANDALONE_SSH_PASSWORD
+    host: process.env.OSS_CLUSTER_SSH_HOST || '172.31.100.211',
+    port: process.env.OSS_CLUSTER_SSH_PORT || '6379',
+    databaseName: `${process.env.OSS_CLUSTER_SSH_DATABASE_NAME || 'oss-cluster-for-ssh'}-${uniqueId}`,
+    databaseUsername: process.env.OSS_CLUSTER_SSH_USERNAME,
+    databasePassword: process.env.OSS_CLUSTER_SSH_PASSWORD
 };
 
 export const ossStandaloneTlsConfig = {

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

@@ -38,16 +38,17 @@ const sshDbClusterPass = {
 };
 
 fixture `Adding database with SSH`
-    .meta({ type: 'critical_path', rte: rte.standalone })
+    .meta({ type: 'critical_path'})
     .page(commonUrl)
     .beforeEach(async() => {
         await databaseHelper.acceptLicenseTerms();
     })
     .after(async() => {
         // Delete databases
-        await databaseAPIRequests.deleteStandaloneDatabasesByNamesApi([sshDbPass.databaseName, sshDbPrivateKey.databaseName, sshDbPasscode.databaseName, newClonedDatabaseAlias]);
+        await databaseAPIRequests.deleteStandaloneDatabasesByNamesApi([sshDbPass.databaseName, sshDbPrivateKey.databaseName, sshDbPasscode.databaseName, newClonedDatabaseAlias, sshDbClusterPass.databaseName]);
     });
-test('Adding database with SSH', async t => {
+test
+    .meta({ rte: rte.standalone })('Adding database with SSH', async t => {
     const tooltipText = [
         'Enter a value for required fields (3):',
         'SSH Host',
@@ -122,14 +123,15 @@ 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 => {
+test
+    .meta({ rte: rte.ossCluster })('Verify that  OSS Cluster database with SSH can be added and work correctly', async t => {
     const sshWithPass = {
         ...sshParams,
         sshPassword: 'pass'
     };
     // Verify that user can add SSH tunnel with Password for OSS Cluster database
     await myRedisDatabasePage.AddRedisDatabaseDialog.addStandaloneSSHDatabase(sshDbClusterPass, sshWithPass);
-    await myRedisDatabasePage.clickOnDBByName(sshDbPass.databaseName);
+    await myRedisDatabasePage.clickOnDBByName(sshDbClusterPass.databaseName);
 
     //verify that db is added and profiler works
     await t.click(browserPage.Profiler.expandMonitor);

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

@@ -192,7 +192,7 @@ test
         };
         // Verify that user can add SSH tunnel with Password for OSS Cluster database
         await myRedisDatabasePage.AddRedisDatabaseDialog.addStandaloneSSHDatabase(sshDbClusterPass, sshWithPass);
-        await myRedisDatabasePage.clickOnDBByName(sshDbPass.databaseName);
+        await myRedisDatabasePage.clickOnDBByName(sshDbClusterPass.databaseName);
         await Common.checkURLContainsText('browser');
     });
 test