Merge pull request #2374 from RedisInsight/e2e/bugfix/e2e-unstable-tests-fixes

fixes for unstable tests

Author: vlad-dargel

tests/e2e/tests/critical-path/database/modules.e2e.ts

@@ -1,3 +1,4 @@
+import { Chance } from 'chance';
 import { Selector } from 'testcafe';
 import { rte, env } from '../../../helpers/constants';
 import { DatabaseHelper } from '../../../helpers/database';
@@ -9,35 +10,46 @@ const myRedisDatabasePage = new MyRedisDatabasePage();
 const browserPage = new BrowserPage();
 const databaseHelper = new DatabaseHelper();
 const databaseAPIRequests = new DatabaseAPIRequests();
+const chance = new Chance();
 
 const moduleNameList = ['RediSearch', 'RedisJSON', 'RedisGraph', 'RedisTimeSeries', 'RedisBloom', 'RedisGears', 'RedisAI'];
 const moduleList = [myRedisDatabasePage.moduleSearchIcon, myRedisDatabasePage.moduleJSONIcon, myRedisDatabasePage.moduleGraphIcon, myRedisDatabasePage.moduleTimeseriesIcon, myRedisDatabasePage.moduleBloomIcon, myRedisDatabasePage.moduleGearsIcon, myRedisDatabasePage.moduleAIIcon];
+const uniqueId = chance.string({ length: 10 });
+let database = {
+    ...ossStandaloneRedisearch,
+    databaseName: `test_standalone-redisearch-${uniqueId}`
+};
 
 fixture `Database modules`
     .meta({ type: 'critical_path' })
     .page(commonUrl)
     .beforeEach(async() => {
         await databaseHelper.acceptLicenseTerms();
-        await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneRedisearch);
+        database = {
+            ...ossStandaloneRedisearch,
+            databaseName: `test_standalone-redisearch-${uniqueId}`
+        };
+        await databaseAPIRequests.addNewStandaloneDatabaseApi(database);
         // Reload Page
         await browserPage.reloadPage();
     })
     .afterEach(async() => {
         // Delete database
-        await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneRedisearch);
+        await databaseAPIRequests.deleteStandaloneDatabaseApi(database);
     });
 test
     .meta({ rte: rte.standalone, env: env.web })('Verify that user can see DB modules on DB list page for Standalone DB', async t => {
         // Check module column on DB list page
         await t.expect(myRedisDatabasePage.moduleColumn.exists).ok('Module column not found');
         // Verify that user can see the following sorting order: Search, JSON, Graph, TimeSeries, Bloom, Gears, AI for modules
-        const databaseLine = myRedisDatabasePage.dbNameList.withExactText(ossStandaloneRedisearch.databaseName).parent('tr');
+        const databaseLine = myRedisDatabasePage.dbNameList.withExactText(database.databaseName).parent('tr');
         await t.expect(databaseLine.visible).ok('Database not found in db list');
         const moduleIcons = databaseLine.find('[data-testid^=Redi]');
-        const numberOfIcons = moduleIcons.count;
-        for (let i = 0; i < await numberOfIcons; i++) {
-            const moduleName = moduleIcons.nth(i).getAttribute('data-testid');
-            await t.expect(moduleName).eql(await moduleList[i].getAttribute('data-testid'), `${moduleName} icon not found`);
+        const numberOfIcons = await moduleIcons.count;
+        for (let i = 0; i < numberOfIcons; i++) {
+            const moduleName = await moduleIcons.nth(i).getAttribute('data-testid');
+            const expectedName = await moduleList[i].getAttribute('data-testid');
+            await t.expect(moduleName).eql(expectedName, `${moduleName} icon not found`);
         }
         //Minimize the window to check quantifier
         await t.resizeWindow(1000, 700);
@@ -64,7 +76,7 @@ test
 test
     .meta({ rte: rte.standalone })('Verify that user can see icons in DB header for RediSearch, RedisGraph, RedisJSON, RedisBloom, RedisTimeSeries, RedisGears, RedisAI default modules', async t => {
         // Connect to DB
-        await myRedisDatabasePage.clickOnDBByName(ossStandaloneRedisearch.databaseName);
+        await myRedisDatabasePage.clickOnDBByName(database.databaseName);
         // Check all available modules in overview
         const moduleIcons = Selector('div').find('[data-testid^=Redi]');
         const numberOfIcons = await moduleIcons.count;

tests/e2e/tests/critical-path/memory-efficiency/recommendations.e2e.ts

@@ -174,8 +174,14 @@ test
         await browserPage.deleteKeyByName(keyName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     })('Verify that user can see the Tutorial opened when clicking on "Tutorial" for recommendations', async t => {
+        const recommendation = memoryEfficiencyPage.getRecommendationByName(searchJsonRecommendation);
+        for (let i = 0; i < 5; i++) {
+            if (!(await recommendation.exists)) {
+                await t.click(memoryEfficiencyPage.newReportBtn);
+            }
+        }
         // Verify that Optimize the use of time series recommendation displayed
-        await t.expect(await memoryEfficiencyPage.getRecommendationByName(searchJsonRecommendation).exists).ok('Query and search JSON documents recommendation not displayed');
+        await t.expect(recommendation.exists).ok('Query and search JSON documents recommendation not displayed');
         // Verify that tutorial opened
         await t.click(memoryEfficiencyPage.getToTutorialBtnByRecomName(searchJsonRecommendation));
         await t.expect(workbenchPage.preselectArea.visible).ok('Workbench Enablement area not opened');