Merge pull request #3356 from RedisInsight/e2e/bugfix/fix-e2e-nightly-update-testcafe

E2e/bugfix/fix e2e nightly update testcafe

Author: vlad-dargel

tests/e2e/common-actions/browser-actions.ts

@@ -37,8 +37,8 @@ export class BrowserActions {
      */
     async verifyTooltipContainsText(expectedText: string, contains: boolean): Promise<void> {
         contains
-            ? await t.expect(browserPage.tooltip.textContent).contains(expectedText, `"${expectedText}" Text is incorrect in tooltip`)
-            : await t.expect(browserPage.tooltip.textContent).notContains(expectedText, `Tooltip still contains text "${expectedText}"`);
+            ? await t.expect(browserPage.tooltip.innerText).contains(expectedText, `"${expectedText}" Text is incorrect in tooltip`)
+            : await t.expect(browserPage.tooltip.innerText).notContains(expectedText, `Tooltip still contains text "${expectedText}"`);
     }
 
     /**

tests/e2e/package.json

@@ -13,7 +13,7 @@
     "build:ui": "yarn --cwd ../../ build:ui",
     "redis:last": "docker run --name redis-last-version -p 7777:6379 -d redislabs/redismod",
     "start:app": "cross-env yarn start:api",
-    "test:chrome": "testcafe --compiler-options typescript.configPath=tsconfig.testcafe.json --cache --disable-multiple-windows --concurrency 1 chrome tests/ -r html:./report/report.html,spec -e -s takeOnFails=true,path=report/screenshots/,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png",
+    "test:chrome": "testcafe --compiler-options typescript.configPath=tsconfig.testcafe.json --cache --allow-insecure-localhost --ignore-certificate-errors --disable-multiple-windows --concurrency 1 chrome tests/ -r html:./report/report.html,spec -e -s takeOnFails=true,path=report/screenshots/,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png",
     "test:chrome:ci": "ts-node ./web.runner.ts",
     "test": "yarn test:chrome",
     "lint": "eslint . --ext .ts,.js,.tsx,.jsx",
@@ -53,8 +53,8 @@
     "redis": "3.1.1",
     "sqlite3": "^5.1.6",
     "supertest": "^4.0.2",
-    "testcafe": "3.5.0",
-    "testcafe-browser-provider-electron": "0.0.20",
+    "testcafe": "3.6.0",
+    "testcafe-browser-provider-electron": "0.0.21",
     "testcafe-reporter-html": "1.4.6",
     "testcafe-reporter-json": "2.2.0",
     "testcafe-reporter-spec": "2.2.0",

tests/e2e/pageObjects/browser-page.ts

@@ -64,7 +64,7 @@ export class BrowserPage extends InstancePage {
     expandJsonObject = Selector('[data-testid=expand-object]');
     scoreButton = Selector('[data-testid=score-button]');
     sortingButton = Selector('[data-testid=header-sorting-button]');
-    editJsonObjectButton = Selector('[data-testid=edit-object-btn]');
+    editJsonObjectButton = Selector('[data-testid=edit-json-field]');
     applyEditButton = Selector('[data-testid=apply-edit-btn]');
     scanMoreButton = Selector('[data-testid=scan-more]');
     resizeBtnKeyList = Selector('[data-test-subj=resize-btn-keyList-keyDetails]');
@@ -864,7 +864,9 @@ export class BrowserPage extends InstancePage {
      * @param jsonStructure The structure of the json key
      */
     async addJsonStructure(jsonStructure: string): Promise<void> {
-        await t.click(this.expandJsonObject);
+        if (await this.expandJsonObject.exists) {
+            await t.click(this.expandJsonObject);
+        }
         await t.click(this.editJsonObjectButton);
         await t.typeText(this.jsonValueInput, jsonStructure, { replace: true, paste: true });
         await t.click(this.applyEditButton);
@@ -970,7 +972,7 @@ export class BrowserPage extends InstancePage {
      * @param guide The guide name
      */
     async clickGuideLinksByName(guide: string): Promise<void> {
-        const linkGuide = Selector(`[data-testid^="guide-button-"]`).withExactText(guide);
+        const linkGuide = Selector('[data-testid^="guide-button-"]').withExactText(guide);
         await t.click(linkGuide);
     }
 }

tests/e2e/tests/web/critical-path/browser/bulk-delete.e2e.ts

@@ -44,7 +44,7 @@ test('Verify that user can access the bulk actions screen in the Browser', async
     // Verify that user can hover over info icon in Bulk Delete preview and see info about accuracy of the calculation
     const tooltipText = 'Expected amount is estimated based on the number of keys scanned and the scan percentage. The final number may be different.';
     await t.hover(browserPage.BulkActions.bulkDeleteTooltipIcon);
-    await t.expect(browserPage.tooltip.textContent).eql(tooltipText, 'Tooltip is not displayed or text is invalid');
+    await t.expect(browserPage.tooltip.innerText).eql(tooltipText, 'Tooltip is not displayed or text is invalid');
     // Verify that user can see warning message clicking on Delete button for Bulk Deletion
     const warningTooltipTitle = 'Are you sure you want to perform this action?';
     const warningTooltipMessage = 'All keys with HASH key type and selected pattern will be deleted.';

tests/e2e/tests/web/critical-path/monitor/save-commands.e2e.ts

@@ -41,7 +41,7 @@ test('Verify that user can see a tooltip and toggle that allows to save Profiler
     await t.hover(browserPage.Profiler.saveLogSwitchButton);
     for (const message of toolTip) {
         await t.click(browserPage.Profiler.saveLogSwitchButton);
-        await t.expect(browserPage.Profiler.saveLogToolTip.textContent).contains(message, 'The toolTip for save log in Profiler is not displayed');
+        await t.expect(browserPage.Profiler.saveLogToolTip.innerText).contains(message, 'The toolTip for save log in Profiler is not displayed');
     }
     // Check toggle state
     await t.expect(browserPage.Profiler.saveLogSwitchButton.getAttribute('aria-checked')).eql('false', 'The toggle state is not OFF when Profiler opened');

tests/e2e/tests/web/regression/browser/full-screen.e2e.ts

@@ -1,7 +1,7 @@
 import { DatabaseHelper } from '../../../../helpers/database';
 import { BrowserPage } from '../../../../pageObjects';
 import { rte } from '../../../../helpers/constants';
-import { commonUrl, ossStandaloneConfig } from '../../../../helpers/conf';
+import { commonUrl, ossStandaloneConfig, ossStandaloneConfigEmpty } from '../../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 import { Common } from '../../../../helpers/common';
 import { APIKeyRequests } from '../../../../helpers/api/api-keys';
@@ -48,21 +48,25 @@ test
         const widthAfterExitFullScreen = await browserPage.keyDetailsTable.clientWidth;
         await t.expect(widthAfterExitFullScreen).lt(widthAfterFullScreen, 'Width after switching from full screen not less then before');
     });
-test.before(async() => {
-    await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);
-    await browserPage.Cli.sendCommandInCli('flushdb');
-})('Verify that when no keys are selected user can click on "Close" control for right table and see key list in full screen', async t => {
+test
+    .before(async() => {
+        await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfigEmpty);
+        await browserPage.Cli.sendCommandInCli('flushdb');
+    })
+    .after(async() => {
+        await browserPage.Cli.sendCommandInCli('flushdb');
+    })('Verify that when no keys are selected user can click on "Close" control for right table and see key list in full screen', async t => {
     // Verify that user sees two panels(key list and empty details panel) opening Browser page for the first time
-    await t.expect(browserPage.noKeysToDisplayText.visible).ok('No keys selected panel not displayed');
-    // Save key table size before switching to full screen
-    const widthKeysBeforeFullScreen = await browserPage.keyListTable.clientWidth;
-    // Close right panel with key details
-    await t.expect(browserPage.keyNameFormDetails.withExactText(keyName).exists).notOk('Key Details Table not displayed');
-    await t.click(browserPage.closeRightPanel);
-    // Check that table is in full screen
-    const widthTableAfterFullScreen = await browserPage.keyListTable.clientWidth;
-    await t.expect(widthTableAfterFullScreen).gt(widthKeysBeforeFullScreen, 'Width after switching to full screen not greater then before');
-});
+        await t.expect(browserPage.noKeysToDisplayText.visible).ok('No keys selected panel not displayed');
+        // Save key table size before switching to full screen
+        const widthKeysBeforeFullScreen = await browserPage.keyListTable.clientWidth;
+        // Close right panel with key details
+        await t.expect(browserPage.keyNameFormDetails.withExactText(keyName).exists).notOk('Key Details Table not displayed');
+        await t.click(browserPage.closeRightPanel);
+        // Check that table is in full screen
+        const widthTableAfterFullScreen = await browserPage.keyListTable.clientWidth;
+        await t.expect(widthTableAfterFullScreen).gt(widthKeysBeforeFullScreen, 'Width after switching to full screen not greater then before');
+    });
 test
     .before(async() => {
         await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);

tests/e2e/tests/web/regression/database-overview/database-overview-keys.e2e.ts

@@ -54,18 +54,15 @@ test
         await t.hover(workbenchPage.OverviewPanel.overviewTotalKeys);
         // Verify that user can see total number of keys and number of keys in current logical database
         await t.expect(browserPage.tooltip.visible).ok('Total keys tooltip not displayed');
-        await browserActions.verifyTooltipContainsText(`${keysAmount + 1}`, true);
-        await browserActions.verifyTooltipContainsText(`Total Keys`, true);
-        await browserActions.verifyTooltipContainsText(`db1:${keysAmount}Keys`, true);
+        await browserActions.verifyTooltipContainsText(`${keysAmount + 1}\nTotal Keys\ndb1:\n${keysAmount}\nKeys`, true);
 
         // Open Database
         await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
         await myRedisDatabasePage.clickOnDBByName(ossStandaloneRedisearch.databaseName);
         await t.hover(workbenchPage.OverviewPanel.overviewTotalKeys);
         // Verify that user can see total number of keys and not it current logical database (if there are no any keys in other logical DBs)
         await t.expect(browserPage.tooltip.visible).ok('Total keys tooltip not displayed');
-        await browserActions.verifyTooltipContainsText(`${keysAmount + 1}`, true);
-        await browserActions.verifyTooltipContainsText(`Total Keys`, true);
+        await browserActions.verifyTooltipContainsText(`${keysAmount + 1}\nTotal Keys`, true);
         await browserActions.verifyTooltipContainsText('db1', false);
     });
 test

tests/e2e/tests/web/regression/tree-view/tree-view.e2e.ts

@@ -26,7 +26,6 @@ fixture `Tree view verifications`
         await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneBigConfig);
     })
     .afterEach(async() => {
-        await browserPage.Cli.sendCommandInCli('flushdb');
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneBigConfig);
     });
 test
@@ -37,7 +36,6 @@ test
     .after(async() => {
         await browserPage.Cli.sendCommandInCli('flushdb');
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfigEmpty);
-        await browserPage.Cli.sendCommandInCli('flushdb');
     })('Verify that user has load sample data button when there are no keys in the database', async t => {
         const message = 'Let\'sstartworkingLoadsampledata+Addkeymanually';
         const actualMessage = await browserPage.keyListMessage.innerText;

tests/e2e/tests/web/regression/triggers-and-functions/libraries.e2e.ts

@@ -52,21 +52,19 @@ fixture `Triggers and Functions`
         await browserPage.Cli.sendCommandInCli(`TFUNCTION DELETE ${libraryName}`);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneRedisGears);
     });
-
 test('Verify that when user can see added library', async t => {
-
     const item = { name: libraryName, user: 'default', pending: 0, totalFunctions: 1 } as TriggersAndFunctionLibrary;
     const command = `TFUNCTION LOAD "#!js api_version=1.0 name=${libraryName}\\n redis.registerFunction(\'foo\', ()=>{return \'bar\'})"`;
+
     await browserPage.Cli.sendCommandInCli(command);
     await t.click(browserPage.NavigationPanel.triggeredFunctionsButton);
     await t.click(triggersAndFunctionsFunctionsPage.librariesLink);
-    const row =  await triggersAndFunctionsLibrariesPage.getLibraryItem(libraryName);
+    const row = await triggersAndFunctionsLibrariesPage.getLibraryItem(libraryName);
     await t.expect(row.name).eql(item.name, 'library name is unexpected');
     await t.expect(row.user).eql(item.user, 'user name is unexpected');
     await t.expect(row.pending).eql(item.pending, 'user name is unexpected');
     await t.expect(row.totalFunctions).eql(item.totalFunctions, 'user name is unexpected');
 });
-
 test('Verify that library details is displayed', async t => {
     const command = `TFUNCTION LOAD "#!js api_version=1.0 name=${libraryName}\\n
             redis.registerFunction('${LIBRARIES_LIST[0].name}', function(){});
@@ -80,13 +78,12 @@ test('Verify that library details is displayed', async t => {
 
     await t.click(browserPage.NavigationPanel.triggeredFunctionsButton);
     await t.click(triggersAndFunctionsFunctionsPage.librariesLink);
-    await t.click(await triggersAndFunctionsLibrariesPage.getLibraryNameSelector(libraryName));
+    await t.click(triggersAndFunctionsLibrariesPage.getLibraryNameSelector(libraryName));
 
     for (const { name, type } of LIBRARIES_LIST) {
         await t.expect(await triggersAndFunctionsLibrariesPage.getFunctionsByName(type, name).exists).ok(`library is not displayed in ${type} section`);
     }
 });
-
 test('Verify that user can modify  code', async t => {
     const command = `TFUNCTION LOAD "#!js api_version=1.0 name=${libraryName}\\n redis.registerFunction(\'foo\', ()=>{return \'bar\'});"`;
     const commandUpdatedPart1 = `#!js api_version=1.0 name=${libraryName}`;
@@ -96,21 +93,20 @@ test('Verify that user can modify  code', async t => {
     await browserPage.Cli.sendCommandInCli(command);
     await t.click(browserPage.NavigationPanel.triggeredFunctionsButton);
     await t.click(triggersAndFunctionsFunctionsPage.librariesLink);
-    await t.click(await triggersAndFunctionsLibrariesPage.getLibraryNameSelector(libraryName));
+    await t.click(triggersAndFunctionsLibrariesPage.getLibraryNameSelector(libraryName));
     await t.click(triggersAndFunctionsLibrariesPage.editMonacoButton);
     await triggersAndFunctionsLibrariesPage.sendTextToMonaco(MonacoEditorInputs.Library, commandUpdatedPart1, commandUpdatedPart2);
     await t.click(triggersAndFunctionsLibrariesPage.acceptButton);
     await t.expect(
         (await triggersAndFunctionsLibrariesPage.getTextFromMonaco())).eql(commandUpdatedPart1 + commandUpdatedPart2), 'code was not updated';
 
-    await t.click(await triggersAndFunctionsLibrariesPage.configurationLink);
+    await t.click(triggersAndFunctionsLibrariesPage.configurationLink);
     await t.click(triggersAndFunctionsLibrariesPage.editMonacoButton);
     await triggersAndFunctionsLibrariesPage.sendTextToMonaco(MonacoEditorInputs.LibraryConfiguration, configuration);
     await t.click(triggersAndFunctionsLibrariesPage.acceptButton);
     await t.expect(
         (await triggersAndFunctionsLibrariesPage.getTextFromMonaco())).eql(configuration, 'configuration was not added');
 });
-
 test('Verify that function details is displayed', async t => {
     const command = `TFUNCTION LOAD "#!js api_version=1.0 name=${libraryName}\\n
             redis.registerAsyncFunction('${LIBRARIES_LIST[2].name}', function(client){
@@ -119,7 +115,7 @@ test('Verify that function details is displayed', async t => {
 
     await browserPage.Cli.sendCommandInCli(command);
     await t.click(browserPage.NavigationPanel.triggeredFunctionsButton);
-    await t.click(await triggersAndFunctionsFunctionsPage.getFunctionsNameSelector(LIBRARIES_LIST[2].name));
+    await t.click(triggersAndFunctionsFunctionsPage.getFunctionsNameSelector(LIBRARIES_LIST[2].name));
     let fieldsAndValue = await triggersAndFunctionsFunctionsPage.getFieldsAndValuesBySection(FunctionsSections.General);
     await t.expect(fieldsAndValue).contains(functionDetails.libraryName, 'library name is not corrected');
     await t.expect(fieldsAndValue).contains(functionDetails.isAsync, 'async is not corrected');
@@ -128,14 +124,14 @@ test('Verify that function details is displayed', async t => {
     await t.expect(fieldsAndValue).contains(functionDetails.flag, 'flag name is not displayed');
 });
 test('Verify that library and functions can be deleted', async t => {
-
     const libraryName2 = `${libraryName}2`;
     const command1 = `TFUNCTION LOAD "#!js api_version=1.0 name=${libraryName}\\n redis.registerFunction(\'${LIBRARIES_LIST[0].name}\', ()=>{return \'bar\'})"`;
     const command2 = `TFUNCTION LOAD "#!js api_version=1.0 name=${libraryName2}\\n redis.registerFunction(\'${LIBRARIES_LIST[1].name}\', ()=>{return \'bar\'})"`;
+
     await browserPage.Cli.sendCommandInCli(command1);
     await browserPage.Cli.sendCommandInCli(command2);
-    await t.click(await browserPage.NavigationPanel.triggeredFunctionsButton);
-    await t.click(await triggersAndFunctionsFunctionsPage.librariesLink);
+    await t.click(browserPage.NavigationPanel.triggeredFunctionsButton);
+    await t.click(triggersAndFunctionsFunctionsPage.librariesLink);
     await triggersAndFunctionsLibrariesPage.deleteLibraryByName(libraryName2);
     await t.expect(await triggersAndFunctionsLibrariesPage.getLibraryNameSelector(libraryName2).exists).notOk(`the library ${libraryName2} was not deleted`);
     await t.click(triggersAndFunctionsLibrariesPage.functionsLink);
@@ -158,7 +154,7 @@ test.after(async() => {
     await t.expect(uploadedText.length).gte(1, 'file was not uploaded');
     await CommonElementsActions.checkCheckbox(triggersAndFunctionsLibrariesPage.addConfigurationCheckBox, true);
     await triggersAndFunctionsLibrariesPage.sendTextToMonaco(MonacoEditorInputs.Configuration, configuration);
-    await t.click(await triggersAndFunctionsLibrariesPage.addLibrarySubmitButton);
+    await t.click(triggersAndFunctionsLibrariesPage.addLibrarySubmitButton);
     await t.expect(triggersAndFunctionsLibrariesPage.getLibraryNameSelector(libNameFromFile).exists).ok('the library was not added');
     await t.expect(triggersAndFunctionsLibrariesPage.getFunctionsByName(LibrariesSections.Functions, functionNameFromFile).exists).ok('the library information was not opened');
 });
@@ -169,7 +165,6 @@ test.after(async() => {
 })('Verify that user can open a Stream key from function', async t => {
     const command1 = `#!js api_version=1.0 name=${libraryName}`;
     const command2 = `redis.registerStreamTrigger('${LIBRARIES_LIST[3].name}', 'name', function(){});`;
-
     const streamKeyParameters: StreamKeyParameters = {
         keyName: streamKeyName,
         entries: [{
@@ -180,6 +175,7 @@ test.after(async() => {
             }]
         }]
     };
+
     await apiKeyRequests.addStreamKeyApi(streamKeyParameters, ossStandaloneRedisGears);
     await t.click(browserPage.NavigationPanel.triggeredFunctionsButton);
     await t.click(triggersAndFunctionsFunctionsPage.librariesLink);

tests/e2e/tests/web/smoke/browser/json-key.e2e.ts

@@ -47,6 +47,5 @@ test('Verify that user can add key with value to any level of JSON structure', a
     await browserPage.addJsonKeyOnTheSameLevel('"key2"', '{}');
     await browserPage.addJsonKeyInsideStructure('"key2222"', '12345');
     // Check the added key contains json object with added key
-    await t.click(browserPage.expandJsonObject);
     await t.expect(browserPage.jsonKeyValue.textContent).eql('{name:"xyz"key1:"value1"key2:{key2222:12345}}', 'The json object value not found');
 });