Merge pull request #2009 from RedisInsight/e2e/bugfix/fixes-for-failed

E2e/bugfix/fixes for failed

Author: vlad-dargel

tests/e2e/test-data/upload-tutorials/customTutorials.zip

@@ -91,9 +91,9 @@ test
 test
     .meta({ rte: rte.standalone })('Verify that when user enters in CLI RediSearch/JSON commands (FT.CREATE, FT.DROPINDEX/JSON.GET, JSON.DEL), he can see hints with arguments', async t => {
         const commandHints = [
-            'index [ON HASH | JSON] [PREFIX count prefix [prefix ...]] [FILTER filter] [LANGUAGE default_lang] [LANGUAGE_FIELD lang_attribute] [SCORE default_score] [SCORE_FIELD score_attribute] [PAYLOAD_FIELD payload_attribute] [MAXTEXTFIELDS] [TEMPORARY seconds] [NOOFFSETS] [NOHL] [NOFIELDS] [NOFREQS] [STOPWORDS count [stopword [stopword ...]]] [SKIPINITIALSCAN] SCHEMA field_name [AS alias] TEXT | TAG | NUMERIC | GEO | VECTOR [WITHSUFFIXTRIE] [SORTABLE [UNF]] [NOINDEX] [field_name [AS alias] TEXT | TAG | NUMERIC | GEO | VECTOR [WITHSUFFIXTRIE] [SORTABLE [UNF]] [NOINDEX] ...]',
-            'index [DD]',
-            'key [INDENT indent] [NEWLINE newline] [SPACE space] [path [path ...]]',
+            'index [data_type] [prefix] [filter] [default_lang] [lang_attribute] [default_score] [score_attribute] [payload_attribute] [maxtextfields] [seconds] [nooffsets] [nohl] [nofields] [nofreqs] [stopwords] [skipinitialscan] schema field [field ...]',
+            'index [delete docs]',
+            'key [indent] [newline] [space] [path [path ...]]',
             'key [path]'
         ];
         const commands = [

tests/e2e/tests/critical-path/cli/cli-critical.e2e.ts

@@ -32,11 +32,12 @@ test
         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');
+        await t.expect(databaseLine.visible).ok('Database not found in db list');
         const moduleIcons = databaseLine.find('[data-testid^=Redi]');
-        const numberOfIcons = await moduleIcons.count;
-        for (let i = 0; i < numberOfIcons; i++) {
+        const numberOfIcons = moduleIcons.count;
+        for (let i = 0; i < await numberOfIcons; i++) {
             const moduleName = moduleIcons.nth(i).getAttribute('data-testid');
-            await t.expect(await moduleName).eql(await moduleList[i].getAttribute('data-testid'), 'Correct icon not found');
+            await t.expect(moduleName).eql(await moduleList[i].getAttribute('data-testid'), `${moduleName} icon not found`);
         }
         //Minimize the window to check quantifier
         await t.resizeWindow(1000, 700);

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

@@ -82,7 +82,7 @@ test
     .meta({ env: env.web })('Verify that user can see in Command helper and click on new group "JSON", can choose it and see list of commands in the group', async t => {
         filteringGroup = 'JSON';
         commandToCheck = 'JSON.SET';
-        commandArgumentsToCheck = 'JSON.SET key path value [NX | XX]';
+        commandArgumentsToCheck = 'JSON.SET key path value [condition]';
         externalPageLink = 'https://redis.io/commands/json.set/';
 
         // Open Command Helper
@@ -102,7 +102,7 @@ test
     .meta({ env: env.web })('Verify that user can see in Command helper and click on new group "Search", can choose it and see list of commands in the group', async t => {
         filteringGroup = 'Search';
         commandToCheck = 'FT.EXPLAIN';
-        commandArgumentsToCheck = 'FT.EXPLAIN index query [DIALECT dialect]';
+        commandArgumentsToCheck = 'FT.EXPLAIN index query [dialect]';
         externalPageLink = 'https://redis.io/commands/ft.explain/';
 
         // Open Command Helper
@@ -216,7 +216,7 @@ test
             'BF.MEXISTS key item [item ...]',
             'CMS.QUERY key item [item ...]',
             'TDIGEST.RESET key',
-            'TOPK.LIST key [WITHCOUNT]',
+            'TOPK.LIST key [withcount]',
             'CF.ADD key item'
         ];
         externalPageLinks = [

tests/e2e/tests/regression/cli/cli-command-helper.e2e.ts

@@ -33,8 +33,6 @@ https://redislabs.atlassian.net/browse/RI-4302, https://redislabs.atlassian.net/
 */
 test('Verify that user can upload tutorial with local zip file without manifest.json', async t => {
     // Verify that user can upload custom tutorials on docker version
-    const imageExternalPath = 'RedisInsight screen external';
-    // const imageRelativePath = 'RedisInsight screen relative';
     folder1 = 'folder-1';
     folder2 = 'folder-2';
     internalLinkName1 = 'probably-1';
@@ -64,14 +62,15 @@ test('Verify that user can upload tutorial with local zip file without manifest.
     await t.click((await workbenchPage.getInternalLinkWithManifest(internalLinkName1)));
     await t.expect(workbenchPage.scrolledEnablementArea.visible).ok('enablement area is not visible after clicked');
 
+    // Error when github upload .zip with relative path in .md
+    // const imageExternalPath = 'RedisInsight screen external';
+    // const imageRelativePath = 'RedisInsight screen relative';
     // Verify that user can see image in custom tutorials by providing absolute external path in md file
-    const imageExternal = await workbenchPage.getTutorialImageByAlt(imageExternalPath);
-    await workbenchPage.waitUntilImageRendered(imageExternal);
-    const imageExternalHeight = await imageExternal.getStyleProperty('height');
-    await t.expect(parseInt(imageExternalHeight.replace(/[^\d]/g, ''))).gte(150);
-
+    // const imageExternal = await workbenchPage.getTutorialImageByAlt(imageExternalPath);
+    // await workbenchPage.waitUntilImageRendered(imageExternal);
+    // const imageExternalHeight = await imageExternal.getStyleProperty('height');
+    // await t.expect(parseInt(imageExternalHeight.replace(/[^\d]/g, ''))).gte(150);
     // Verify that user can see image in custom tutorials by providing relative path in md file
-    // Error when github upload .zip with relative path in .md
     // const imageRelative = await workbenchPage.getTutorialImageByAlt(imageRelativePath);
     // await workbenchPage.waitUntilImageRendered(imageRelative);
     // const imageRelativeHeight = await imageRelative.getStyleProperty('height');

tests/e2e/tests/regression/workbench/import-tutorials.e2e.ts

@@ -44,7 +44,7 @@ wait_for()
             echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
             break
         fi
-        sleep 1
+        sleep 30
     done
     return $WAITFORIT_result
 }