fixes for tests, deleted await in assertions for stability, added paste and replace to typeText method

vlad-dargel · vlad-dargel · commit 58e5427856a7 · 2022-10-25T19:08:05.000+02:00
diff --git a/tests/e2e/helpers/database.ts b/tests/e2e/helpers/database.ts
@@ -231,6 +231,17 @@ export async function deleteDatabase(databaseName: string): Promise<void> {
     }
 }
 
+/**
+ * Delete database with custom name
+ * @param databaseName The database name
+*/
+export async function deleteCustomDatabase(databaseName: string): Promise<void> {
+    await t.click(myRedisDatabasePage.myRedisDBButton);
+    if (await addRedisDatabasePage.addDatabaseButton.exists) {
+        await myRedisDatabasePage.deleteDatabaseByName(databaseName);
+    }
+}
+
 /**
  * Accept License terms and add database or connect to the Redis stask database
  * @param databaseParameters The database parameters
diff --git a/tests/e2e/pageObjects/add-redis-database-page.ts b/tests/e2e/pageObjects/add-redis-database-page.ts
@@ -18,7 +18,7 @@ export class AddRedisDatabasePage {
     showDatabasesButton = Selector('[data-testid=btn-show-databases]');
     databaseName = Selector('.euiTableCellContent.column_name');
     selectAllCheckbox = Selector('[data-test-subj=checkboxSelectAll]');
-    databaseIndexCheckbox = Selector('[data-testid=showDb]~div');
+    databaseIndexCheckbox = Selector('[data-testid=showDb]~div', { timeout: 500 });
     connectToDatabaseButton = Selector('[data-testid=connect-to-db-btn]');
     connectToRedisStackButton = Selector('[aria-label="Connect to database"]');
     discoverSentinelDatabaseButton = Selector('[data-testid=btn-submit]');
diff --git a/tests/e2e/tests/critical-path/browser/context.e2e.ts b/tests/e2e/tests/critical-path/browser/context.e2e.ts
@@ -88,7 +88,7 @@ test('Verify that user can see saved executed commands in CLI on Browser page wh
     // Return back to Browser and check executed command in CLI
     await t.click(myRedisDatabasePage.browserButton);
     for(const command of commands) {
-        await t.expect(await cliPage.cliCommandExecuted.withExactText(command).exists).ok(`Executed command '${command}' in CLI is saved`);
+        await t.expect(cliPage.cliCommandExecuted.withExactText(command).exists).ok(`Executed command '${command}' in CLI is saved`);
     }
 });
 test
@@ -104,7 +104,7 @@ test
         await t.click(myRedisDatabasePage.settingsButton);
         // Return back to Browser and check key details selected
         await t.click(myRedisDatabasePage.browserButton);
-        await t.expect(await browserPage.keyNameFormDetails.withExactText(keyName).exists).ok('The key details is selected');
+        await t.expect(browserPage.keyNameFormDetails.withExactText(keyName).exists).ok('The key details is selected');
     });
 test
     .after(async() => {
diff --git a/tests/e2e/tests/critical-path/memory-efficiency/memory-efficiency.e2e.ts b/tests/e2e/tests/critical-path/memory-efficiency/memory-efficiency.e2e.ts
@@ -92,9 +92,9 @@ test
         // Verify that user can quickly set the filters per keyspaces in the Browser/Tree View from the list of keyspaces
         await t.click(memoryEfficiencyPage.expandedItem);
         // Verify filter by data type applied
-        await t.expect(await browserPage.filteringLabel.textContent).eql('Stream', 'Key type lable is not displayed in search input');
+        await t.expect(browserPage.filteringLabel.textContent).eql('Stream', 'Key type lable is not displayed in search input');
         // Verify keyname in search input prepopulated
-        await t.expect(await browserPage.filterByPatterSearchInput.withAttribute('value', keySpaces[0]).exists).ok('Filter per key name is not applied');
+        await t.expect(browserPage.filterByPatterSearchInput.withAttribute('value', keySpaces[0]).exists).ok('Filter per key name is not applied');
         // Verify key is displayed
         await t.click(browserPage.browserViewButton);
         await t.expect(await browserPage.isKeyIsDisplayedInTheList(streamKeyName)).ok('Key is not found');
diff --git a/tests/e2e/tests/critical-path/workbench/autocomplete.e2e.ts b/tests/e2e/tests/critical-path/workbench/autocomplete.e2e.ts
@@ -28,7 +28,7 @@ test('Verify that when user have selected a command (via “Enter” from the li
     // Start type characters and select command
     await t.typeText(workbenchPage.queryInput, 'LI', { replace: true });
     // Verify that the list with auto-suggestions is displayed
-    await t.expect(await workbenchPage.monacoSuggestion.exists).ok('Auto-suggestions are displayed');
+    await t.expect(workbenchPage.monacoSuggestion.exists).ok('Auto-suggestions are displayed');
     // Select command and check result
     await t.pressKey('enter');
     const script = await workbenchPage.queryInputScriptArea.textContent;
diff --git a/tests/e2e/tests/critical-path/workbench/scripting-area.e2e.ts b/tests/e2e/tests/critical-path/workbench/scripting-area.e2e.ts
@@ -36,8 +36,8 @@ test('Verify that user can resize scripting area in Workbench', async t => {
 
     await workbenchPage.sendCommandInWorkbench(commandForSend);
     // Verify that user can run any script from CLI in Workbench and see the results
-    await t.expect(await workbenchPage.queryCardContainer.exists).ok('Query card was added');
-    const sentCommandText = await workbenchPage.queryCardCommand.withExactText(commandForSend);
+    await t.expect(workbenchPage.queryCardContainer.exists).ok('Query card was added');
+    const sentCommandText = workbenchPage.queryCardCommand.withExactText(commandForSend);
     await t.expect(sentCommandText.exists).ok('Result of sent command exists');
 
     await t.hover(workbenchPage.resizeButtonForScriptingAndResults);
diff --git a/tests/e2e/tests/regression/browser/context.e2e.ts b/tests/e2e/tests/regression/browser/context.e2e.ts
@@ -38,13 +38,13 @@ test('Verify that if user has saved context on Browser page and go to Settings p
     await t.pressKey('enter');
     await t.click(myRedisDatabasePage.settingsButton);
     // Verify that Browser and Workbench icons are displayed
-    await t.expect(await myRedisDatabasePage.browserButton.visible).ok('Browser icon is not displayed');
-    await t.expect(await myRedisDatabasePage.workbenchButton.visible).ok('Workbench icon is not displayed');
+    await t.expect(myRedisDatabasePage.browserButton.visible).ok('Browser icon is not displayed');
+    await t.expect(myRedisDatabasePage.workbenchButton.visible).ok('Workbench icon is not displayed');
     // Open Browser page and verify context
     await t.click(myRedisDatabasePage.browserButton);
-    await t.expect(await browserPage.filterByPatterSearchInput.withAttribute('value', keyName).exists).ok('Filter per key name is not applied');
-    await t.expect(await browserPage.keyNameFormDetails.withExactText(keyName).exists).ok('The key details is not selected');
-    await t.expect(await cliPage.cliCommandExecuted.withExactText(command).exists).ok(`Executed command '${command}' in CLI is not saved`);
+    await t.expect(browserPage.filterByPatterSearchInput.withAttribute('value', keyName).exists).ok('Filter per key name is not applied');
+    await t.expect(browserPage.keyNameFormDetails.withExactText(keyName).exists).ok('The key details is not selected');
+    await t.expect(cliPage.cliCommandExecuted.withExactText(command).exists).ok(`Executed command '${command}' in CLI is not saved`);
     await t.click(cliPage.cliCollapseButton);
 });
 test('Verify that when user reload the window with saved context(on any page), context is not saved when he returns back to Browser page', async t => {
@@ -55,13 +55,13 @@ test('Verify that when user reload the window with saved context(on any page), c
     await t.click(myRedisDatabasePage.workbenchButton);
     // Open Browser page and verify context
     await t.click(myRedisDatabasePage.browserButton);
-    await t.expect(await browserPage.filterByPatterSearchInput.withAttribute('value', keyName).exists).ok('Filter per key name is not applied');
-    await t.expect(await browserPage.keyNameFormDetails.withExactText(keyName).exists).ok('The key details is not selected');
+    await t.expect(browserPage.filterByPatterSearchInput.withAttribute('value', keyName).exists).ok('Filter per key name is not applied');
+    await t.expect(browserPage.keyNameFormDetails.withExactText(keyName).exists).ok('The key details is not selected');
     // Navigate to Workbench and reload the window
     await t.click(myRedisDatabasePage.workbenchButton);
     await common.reloadPage();
     // Return back to Browser and check context is not saved
     await t.click(myRedisDatabasePage.browserButton);
-    await t.expect(await browserPage.filterByPatterSearchInput.withAttribute('value', keyName).exists).notOk('Filter per key name is applied');
-    await t.expect(await browserPage.keyNameFormDetails.withExactText(keyName).exists).notOk('The key details is selected');
+    await t.expect(browserPage.filterByPatterSearchInput.withAttribute('value', keyName).exists).notOk('Filter per key name is applied');
+    await t.expect(browserPage.keyNameFormDetails.withExactText(keyName).exists).notOk('The key details is selected');
 });
diff --git a/tests/e2e/tests/regression/browser/database-overview-keys.e2e.ts b/tests/e2e/tests/regression/browser/database-overview-keys.e2e.ts
@@ -1,5 +1,5 @@
 import { t } from 'testcafe';
-import { acceptLicenseTermsAndAddDatabase, acceptLicenseTermsAndAddRECloudDatabase, deleteDatabase } from '../../../helpers/database';
+import { acceptLicenseTermsAndAddDatabase, acceptLicenseTermsAndAddRECloudDatabase, deleteCustomDatabase, deleteDatabase } from '../../../helpers/database';
 import {
     MyRedisDatabasePage,
     CliPage,
@@ -11,7 +11,6 @@ import { rte } from '../../../helpers/constants';
 import { cloudDatabaseConfig, commonUrl, ossStandaloneRedisearch } from '../../../helpers/conf';
 import { Common } from '../../../helpers/common';
 import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
-import { deleteAllKeysFromDB } from '../../../helpers/keys';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const workbenchPage = new WorkbenchPage();
@@ -48,7 +47,7 @@ fixture `Database overview`
         await t.click(myRedisDatabasePage.myRedisDBButton);
         await myRedisDatabasePage.clickOnDBByName(`${ossStandaloneRedisearch.databaseName} [${index}]`);
         await cliPage.sendCommandInCli(`DEL ${keys.join(' ')}`);
-        await deleteDatabase(`${ossStandaloneRedisearch.databaseName} [${index}]`);
+        await deleteCustomDatabase(`${ossStandaloneRedisearch.databaseName} [${index}]`);
         await myRedisDatabasePage.clickOnDBByName(ossStandaloneRedisearch.databaseName);
         await browserPage.deleteKeyByName(keyName);
         await deleteStandaloneDatabaseApi(ossStandaloneRedisearch);
diff --git a/tests/e2e/tests/regression/browser/filtering.e2e.ts b/tests/e2e/tests/regression/browser/filtering.e2e.ts
@@ -185,6 +185,6 @@ test
                 ? Selector('[data-testid^=badge-ReJSON]')
                 : Selector(`[data-testid^=badge-${keyTypes[i].keyName}]`);
             // Verify that all results have the same type as in filter
-            await t.expect(await browserPage.filteringLabel.count).eql(await filteredTypeKeys.count, `The keys of type ${keyTypes[i].textType} not filtered correctly`);
+            await t.expect(browserPage.filteringLabel.count).eql(await filteredTypeKeys.count, `The keys of type ${keyTypes[i].textType} not filtered correctly`);
         }
     });
diff --git a/tests/e2e/tests/regression/cli/cli-logical-db.e2e.ts b/tests/e2e/tests/regression/cli/cli-logical-db.e2e.ts
@@ -1,4 +1,4 @@
-import { acceptLicenseTerms, deleteDatabase } from '../../../helpers/database';
+import { acceptLicenseTerms, deleteCustomDatabase } from '../../../helpers/database';
 import { CliPage, AddRedisDatabasePage, MyRedisDatabasePage } from '../../../pageObjects';
 import {
     commonUrl,
@@ -28,7 +28,7 @@ fixture `CLI logical database`
     })
     .afterEach(async() => {
         // Delete database
-        await deleteDatabase(`${ossStandaloneConfig.databaseName  } [${index}]`);
+        await deleteCustomDatabase(`${ossStandaloneConfig.databaseName} [${index}]`);
     });
 test
     .after(async() => {
diff --git a/tests/e2e/tests/regression/database/redisstack.e2e.ts b/tests/e2e/tests/regression/database/redisstack.e2e.ts
@@ -43,7 +43,7 @@ test('Verify that user can see Redis Stack icon in Edit mode near the DB name',
     // Verify that user can see the Redis Stack logo is placed in the DB edit form when hover over the RedisStack logo
     await t.hover(myRedisDatabasePage.redisStackIcon);
     await t.expect(myRedisDatabasePage.tooltipRedisStackLogo.visible).ok('Redis Stack logo not found');
-    const databaseName = await myRedisDatabasePage.redisStackIcon.parent().nextSibling();
+    const databaseName = myRedisDatabasePage.redisStackIcon.parent().nextSibling();
     await t.expect(databaseName.withAttribute('data-testid', 'edit-alias-btn').exists).ok('Edit button not found');
 });
 test('Verify that user can see Redis Stack icon and logo in Browser page in Overview.', async t => {
diff --git a/tests/e2e/tests/regression/monitor/monitor.e2e.ts b/tests/e2e/tests/regression/monitor/monitor.e2e.ts
@@ -79,7 +79,7 @@ test('Verify Monitor refresh/stop', async t => {
     // Click on refresh keys to get new logs
     await t.click(browserPage.refreshKeysButton);
     // Get last timestamp
-    const lastTimestampSelector = await monitorPage.monitorCommandLineTimestamp.nth(-1);
+    const lastTimestampSelector = monitorPage.monitorCommandLineTimestamp.nth(-1);
     // Stop Monitor
     await monitorPage.stopMonitor();
     // Click on Clear button
diff --git a/tests/e2e/tests/regression/shortcuts/shortcuts.e2e.ts b/tests/e2e/tests/regression/shortcuts/shortcuts.e2e.ts
@@ -17,6 +17,8 @@ fixture `Shortcuts`
     });
 test
     .meta({ env: env.web })('Verify that user can see a summary of Shortcuts by clicking "Keyboard Shortcuts" button in Help Center', async t => {
+        const link = 'https://github.com/RedisInsight/RedisInsight/releases';
+
         // Click on help center icon and verify panel
         await t.click(myRedisDatabasePage.helpCenterButton);
         await t.expect(helpCenterPage.helpCenterPanel.exists).ok('Help Center panel is not opened');
@@ -32,7 +34,6 @@ test
         await t.click(shortcutsPage.shortcutsCloseButton);
         await t.expect(shortcutsPage.shortcutsPanel.exists).notOk('Shortcuts panel is not displayed');
 
-        const link = 'https://github.com/RedisInsight/RedisInsight/releases';
         // Click on the Release Notes in Help Center
         await t.click(myRedisDatabasePage.helpCenterButton);
         await t.click(helpCenterPage.helpCenterReleaseNotesButton);
diff --git a/tests/e2e/tests/regression/workbench/autocomplete.e2e.ts b/tests/e2e/tests/regression/workbench/autocomplete.e2e.ts
@@ -33,13 +33,13 @@ test('Verify that user can open the "read more" about the command by clicking on
     await t.typeText(workbenchPage.queryInput, command, { replace: true });
     // Open the read more by clicking on the "ctrl+space" and check
     await t.pressKey('ctrl+space');
-    await t.expect(await workbenchPage.monacoCommandDetails.exists).ok('The "read more" about the command is not opened');
+    await t.expect(workbenchPage.monacoCommandDetails.exists).ok('The "read more" about the command is not opened');
     for(const detail of commandDetails) {
-        await t.expect(await workbenchPage.monacoCommandDetails.textContent).contains(detail, `The ${detail} command detail is not displayed`);
+        await t.expect(workbenchPage.monacoCommandDetails.textContent).contains(detail, `The ${detail} command detail is not displayed`);
     }
     // Close the command details
     await t.pressKey('ctrl+space');
-    await t.expect(await workbenchPage.monacoCommandDetails.exists).notOk('The "read more" about the command is not closed');
+    await t.expect(workbenchPage.monacoCommandDetails.exists).notOk('The "read more" about the command is not closed');
 });
 test('Verify that user can see static list of arguments is displayed when he enters the command in Editor in Workbench', async t => {
     const command = 'AI.SCRIPTEXECUTE';
@@ -66,7 +66,7 @@ test('Verify that user can see the static list of arguments when he uses “Ctrl
     const command = 'JSON.ARRAPPEND';
     await t.typeText(workbenchPage.queryInput, command, { replace: true });
     // Verify that the list with auto-suggestions is displayed
-    await t.expect(await workbenchPage.monacoSuggestion.exists).ok('Auto-suggestions are not displayed');
+    await t.expect(workbenchPage.monacoSuggestion.exists).ok('Auto-suggestions are not displayed');
     // Select the command from suggestion list
     await t.pressKey('enter');
     // Check that the command is displayed in Editing area after selecting
diff --git a/tests/e2e/tests/regression/workbench/command-results.e2e.ts b/tests/e2e/tests/regression/workbench/command-results.e2e.ts
@@ -42,11 +42,11 @@ test
         // Send FT.INFO and switch to Text view
         await workbenchPage.sendCommandInWorkbench(infoCommand);
         await workbenchPage.selectViewTypeText();
-        await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).exists).ok('The text view is not switched for command FT.INFO');
+        await t.expect(workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).exists).ok('The text view is not switched for command FT.INFO');
         // Switch to Table view and check result
         await workbenchPage.selectViewTypeTable();
         await t.switchToIframe(workbenchPage.iframe);
-        await t.expect(await workbenchPage.queryTableResult.exists).ok('The table view is not switched for command FT.INFO');
+        await t.expect(workbenchPage.queryTableResult.exists).ok('The table view is not switched for command FT.INFO');
     });
 test
     .meta({ env: env.web })('Verify that user can switches between Table and Text for FT.SEARCH and see results corresponding to their views', async t => {
@@ -55,11 +55,11 @@ test
         // Send FT.SEARCH and switch to Text view
         await workbenchPage.sendCommandInWorkbench(searchCommand);
         await workbenchPage.selectViewTypeText();
-        await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).visible).ok('The text view is not switched for command FT.SEARCH');
+        await t.expect(workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).visible).ok('The text view is not switched for command FT.SEARCH');
         // Switch to Table view and check result
         await workbenchPage.selectViewTypeTable();
         await t.switchToIframe(workbenchPage.iframe);
-        await t.expect(await workbenchPage.queryTableResult.exists).ok('The table view is not switched for command FT.SEARCH');
+        await t.expect(workbenchPage.queryTableResult.exists).ok('The table view is not switched for command FT.SEARCH');
     });
 test
     .meta({ env: env.web })('Verify that user can switches between Table and Text for FT.AGGREGATE and see results corresponding to their views', async t => {
@@ -68,11 +68,11 @@ test
         // Send FT.AGGREGATE and switch to Text view
         await workbenchPage.sendCommandInWorkbench(aggregateCommand);
         await workbenchPage.selectViewTypeText();
-        await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).visible).ok('The text view is not switched for command FT.AGGREGATE');
+        await t.expect(workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).visible).ok('The text view is not switched for command FT.AGGREGATE');
         // Switch to Table view and check result
         await workbenchPage.selectViewTypeTable();
         await t.switchToIframe(workbenchPage.iframe);
-        await t.expect(await workbenchPage.queryTableResult.exists).ok('The table view is not switched for command FT.AGGREGATE');
+        await t.expect(workbenchPage.queryTableResult.exists).ok('The table view is not switched for command FT.AGGREGATE');
     });
 // Skipped due to issue https://redislabs.atlassian.net/browse/RI-3524
 test.skip
@@ -83,10 +83,10 @@ test.skip
         await workbenchPage.sendCommandInWorkbench(command);
         await t.click(workbenchPage.fullScreenButton);
         await t.switchToIframe(workbenchPage.iframe);
-        await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTableResult).visible).ok('The search results are displayed in Table view by default');
+        await t.expect(workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTableResult).visible).ok('The search results are displayed in Table view by default');
         // Select Text view from dropdown
         await t.switchToMainWindow();
         await workbenchPage.selectViewTypeText();
         // Verify that search results are displayed in Text view
-        await t.expect(await workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).visible).ok('The result is displayed in Text view');
+        await t.expect(workbenchPage.queryCardContainer.nth(0).find(workbenchPage.cssQueryTextResult).visible).ok('The result is displayed in Text view');
     });
diff --git a/tests/e2e/tests/regression/workbench/context.e2e.ts b/tests/e2e/tests/regression/workbench/context.e2e.ts
diff --git a/tests/e2e/tests/regression/workbench/redis-stack-commands.e2e.ts b/tests/e2e/tests/regression/workbench/redis-stack-commands.e2e.ts
diff --git a/tests/e2e/tests/regression/workbench/scripting-area.e2e.ts b/tests/e2e/tests/regression/workbench/scripting-area.e2e.ts
diff --git a/tests/e2e/tests/smoke/workbench/scripting-area.e2e.ts b/tests/e2e/tests/smoke/workbench/scripting-area.e2e.ts
diff --git a/tests/e2e/web.runner.ts b/tests/e2e/web.runner.ts

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,6 @@ test`
`185`	`185`	`? Selector('[data-testid^=badge-ReJSON]')`
`186`	`186`	: Selector(`[data-testid^=badge-${keyTypes[i].keyName}]`);
`187`	`187`	`// Verify that all results have the same type as in filter`
`188`		- await t.expect(await browserPage.filteringLabel.count).eql(await filteredTypeKeys.count, `The keys of type ${keyTypes[i].textType} not filtered correctly`);
	`188`	+ await t.expect(browserPage.filteringLabel.count).eql(await filteredTypeKeys.count, `The keys of type ${keyTypes[i].textType} not filtered correctly`);
`189`	`189`	`}`
`190`	`190`	`});`