Merge branch 'main' into e2e/feature/RI_4499-update_circleci-to-run-desktop-tests

Author: vlad-dargel

tests/e2e/helpers/keys.ts

@@ -252,7 +252,7 @@ export async function deleteAllKeysFromDB(host: string, port: string): Promise<v
 */
 export async function verifyKeysDisplayedInTheList(keyNames: string[]): Promise<void> {
     for (const keyName of keyNames) {
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyName)).ok(`The key ${keyName} not found`);
+        await t.expect(browserPage.getKeySelectorByName(keyName).exists).ok(`The key ${keyName} not found`);
     }
 }
 

tests/e2e/pageObjects/browser-page.ts

@@ -527,7 +527,7 @@ export class BrowserPage extends InstancePage {
      * Get selector by key name
      * @param keyName The name of the key
      */
-    async getKeySelectorByName(keyName: string): Promise<Selector> {
+    getKeySelectorByName(keyName: string): Selector {
         return Selector(`[data-testid="key-${keyName}"]`);
     }
 
@@ -536,7 +536,7 @@ export class BrowserPage extends InstancePage {
      * @param keyName The name of the key
      */
     async isKeyIsDisplayedInTheList(keyName: string): Promise<boolean> {
-        const keyNameInTheList = Selector(`[data-testid="key-${keyName}"]`);
+        const keyNameInTheList = this.getKeySelectorByName(keyName);
         await Common.waitForElementNotVisible(this.loader);
         return keyNameInTheList.exists;
     }

tests/e2e/pageObjects/components/instance/command-helper.ts

@@ -47,7 +47,7 @@ export class CommandHelper {
     async checkURLCommand(command: string, url: string): Promise<void> {
         await t.click(this.cliHelperOutputTitles.withExactText(command));
         await t.click(this.readMoreButton);
-        await t.expect(Common.getPageUrl()).eql(url, 'The opened page not correct');
+        await t.expect(await Common.getPageUrl()).eql(url, 'The opened page not correct');
     }
 
     /**

tests/e2e/pageObjects/settings-page.ts

@@ -92,6 +92,7 @@ export class SettingsPage extends BasePage {
      * Turn on notifications in Settings
      */
     async changeNotificationsSwitcher(toValue: boolean): Promise<void> {
+        await t.click(this.NavigationPanel.settingsButton);
         await t.click(this.accordionAppearance);
         if (toValue !== await this.getNotificationsSwitcherValue()) {
             await t.click(this.switchNotificationsOption);

tests/e2e/tests/critical-path/browser/search-capabilities.e2e.ts

@@ -78,41 +78,41 @@ test
         // Verify that user can search by index in Browser view
         await browserPage.selectIndexByName(indexName);
         await verifyKeysDisplayedInTheList(keyNames);
-        await t.expect((await browserPage.getKeySelectorByName(keyName)).exists).notOk('Key without index displayed after search');
+        await t.expect(browserPage.getKeySelectorByName(keyName).exists).notOk('Key without index displayed after search');
         // Verify that user can search by index plus key value
         await browserPage.searchByKeyName('Hall School');
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyNames[0])).ok(`The key ${keyNames[0]} not found`);
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyNames[1])).notOk(`Invalid key ${keyNames[1]} is displayed after search`);
+        await t.expect(browserPage.getKeySelectorByName(keyNames[0]).exists).ok(`The key ${keyNames[0]} not found`);
+        await t.expect(browserPage.getKeySelectorByName(keyNames[1]).exists).notOk(`Invalid key ${keyNames[1]} is displayed after search`);
         // Verify that user can search by index plus multiple key values
         await browserPage.searchByKeyName(searchPerValue);
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyNames[0])).ok(`The first valid key ${keyNames[0]} not found`);
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyNames[2])).ok(`The second valid key ${keyNames[2]} not found`);
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyNames[1])).notOk(`Invalid key ${keyNames[1]} is displayed after search`);
+        await t.expect(browserPage.getKeySelectorByName(keyNames[0]).exists).ok(`The first valid key ${keyNames[0]} not found`);
+        await t.expect(browserPage.getKeySelectorByName(keyNames[2]).exists).ok(`The second valid key ${keyNames[2]} not found`);
+        await t.expect(browserPage.getKeySelectorByName(keyNames[1]).exists).notOk(`Invalid key ${keyNames[1]} is displayed after search`);
 
         // Verify that user can use filter history for RediSearch query
         await t.click(browserPage.showFilterHistoryBtn);
         await t.click(browserPage.filterHistoryOption.withText('Hall School'));
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyNames[0])).ok(`The key ${keyNames[0]} not found`);
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyNames[1])).notOk(`Invalid key ${keyNames[1]} is displayed after search`);
+        await t.expect(browserPage.getKeySelectorByName(keyNames[0]).exists).ok(`The key ${keyNames[0]} not found`);
+        await t.expect(browserPage.getKeySelectorByName(keyNames[1]).exists).notOk(`Invalid key ${keyNames[1]} is displayed after search`);
 
         // Verify that user can clear the search
         await t.click(browserPage.clearFilterButton);
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyNames[1])).ok(`The key ${keyNames[1]} not found`);
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyName)).notOk('Search not cleared');
+        await t.expect(browserPage.getKeySelectorByName(keyNames[1]).exists).ok(`The key ${keyNames[1]} not found`);
+        await t.expect(browserPage.getKeySelectorByName(keyName).exists).notOk('Search not cleared');
 
         // Verify that user can search by index in Tree view
         await t.click(browserPage.treeViewButton);
         // Change delimiter
         await browserPage.changeDelimiterInTreeView('-');
         await browserPage.selectIndexByName(indexName);
         await verifyKeysDisplayedInTheList(keyNames);
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyName)).notOk('Key without index displayed after search');
+        await t.expect(browserPage.getKeySelectorByName(keyName).exists).notOk('Key without index displayed after search');
 
         // Verify that user see the database scanned when he switch to Pattern search mode
         await t.click(browserPage.patternModeBtn);
         await t.click(browserPage.browserViewButton);
         await verifyKeysDisplayedInTheList(keyNames);
-        await t.expect(await browserPage.isKeyIsDisplayedInTheList(keyName)).ok('Database not scanned after returning to Pattern search mode');
+        await t.expect(browserPage.getKeySelectorByName(keyName).exists).ok('Database not scanned after returning to Pattern search mode');
     });
 test
     .before(async() => {
@@ -228,7 +228,7 @@ test
         await browserPage.selectIndexByName(indexName);
         await browserPage.searchByKeyName(searchPerValue);
         // Select key
-        await t.click(await browserPage.getKeySelectorByName(keyName));
+        await t.click(browserPage.getKeySelectorByName(keyName));
 
         // Verify that Redisearch context (inputs, key selected, scroll, key details) saved after switching between pages
         await t

tests/e2e/tests/critical-path/notifications/notification-center.e2e.ts

@@ -114,7 +114,10 @@ test('Verify that all messages in notification center are sorted by timestamp fr
 });
 test
     .before(async t => {
+        await acceptLicenseTerms();
         await settingsPage.changeNotificationsSwitcher(false);
+        await deleteAllNotificationsFromDB();
+        await myRedisDatabasePage.reloadPage();
         await t.expect(NotificationPanel.notificationBadge.exists).notOk('No badge');
     })('Verify that new popup message is not displayed when notifications are turned off', async t => {
         // Verify that user can see notification badge increased when new messages is sent and notifications are turned off

tests/e2e/tests/regression/browser/add-keys.e2e.ts

@@ -31,7 +31,7 @@ fixture `Add keys`
     });
 test('Verify that user can create different types(string, number, null, array, boolean) of JSON', async t => {
     for (let i = 0; i < jsonKeys.length; i++) {
-        const keySelector = await browserPage.getKeySelectorByName(jsonKeys[i][0]);
+        const keySelector = browserPage.getKeySelectorByName(jsonKeys[i][0]);
         await browserPage.addJsonKey(jsonKeys[i][0], jsonKeys[i][1]);
         await t.hover(browserPage.Toast.toastCloseButton);
         await t.click(browserPage.Toast.toastCloseButton);