Merge pull request #1528 from RedisInsight/feature/e2e-fixes-for-release-2.16.0

fix e2e

Author: vlad-dargel

tests/e2e/helpers/database.ts

@@ -185,7 +185,7 @@ export async function acceptLicenseTermsAndAddRECloudDatabase(databaseParameters
     await addRedisDatabasePage.addRedisDataBase(databaseParameters);
     // Click for saving
     await t.click(addRedisDatabasePage.addRedisDatabaseButton);
-    await t.wait(2000);
+    await t.wait(3000);
     // Reload page until db appears
     do {
         await common.reloadPage();
@@ -196,6 +196,27 @@ export async function acceptLicenseTermsAndAddRECloudDatabase(databaseParameters
     await t.expect(browserPage.keysSummary.exists).ok('Key list not loaded', { timeout: 15000 });
 }
 
+/**
+ * Add RE Cloud database
+ * @param databaseParameters The database parameters
+*/
+export async function addRECloudDatabase(databaseParameters: AddNewDatabaseParameters): Promise<void> {
+    const searchTimeout = 60 * 1000; // 60 sec to wait database appearing
+    const dbSelector = myRedisDatabasePage.dbNameList.withExactText(databaseParameters.databaseName ?? '');
+    const startTime = Date.now();
+
+    await addRedisDatabasePage.addRedisDataBase(databaseParameters);
+    // Click for saving
+    await t.click(addRedisDatabasePage.addRedisDatabaseButton);
+    await t.wait(3000);
+    // Reload page until db appears
+    do {
+        await common.reloadPage();
+    }
+    while (!(await dbSelector.exists) && Date.now() - startTime < searchTimeout);
+    await t.expect(myRedisDatabasePage.dbNameList.withExactText(databaseParameters.databaseName ?? '').exists).ok('The database not displayed', { timeout: 5000 });
+}
+
 // Accept License terms
 export async function acceptLicenseTerms(): Promise<void> {
     await t.maximizeWindow();

tests/e2e/tests/smoke/database/add-standalone-db.e2e.ts

@@ -5,7 +5,7 @@ import {
     addOSSClusterDatabase,
     acceptLicenseTerms,
     deleteDatabase,
-    acceptLicenseTermsAndAddRECloudDatabase
+    addRECloudDatabase
 } from '../../../helpers/database';
 import {
     commonUrl,
@@ -60,8 +60,11 @@ test
     });
 
 test
-    .meta({ rte: rte.reCloud })('Verify that user can add database from RE Cloud via auto-discover flow', async() => {
-        await acceptLicenseTermsAndAddRECloudDatabase(cloudDatabaseConfig);
+    .meta({ rte: rte.reCloud })
+    .after(async() => {
+        await deleteDatabase(cloudDatabaseConfig.databaseName);
+    })('Verify that user can add database from RE Cloud via auto-discover flow', async() => {
+        await addRECloudDatabase(cloudDatabaseConfig);
         // Verify new connection badge for RE cloud
         await myRedisDatabasePage.verifyDatabaseStatusIsVisible();
     });