E2e/feature/ri 6268 enhance form to add database connections

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

@@ -24,10 +24,11 @@ export class DatabasesActions {
      */
     async importDatabase(fileParameters: ImportDatabaseParameters): Promise<void> {
         await t
-            .click(await myRedisDatabasePage.importDatabasesBtn)
+            .click(myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton)
+            .click(myRedisDatabasePage.importDatabasesBtn)
             .setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [fileParameters.path])
-            .click(myRedisDatabasePage.submitImportBtn)
-            .expect(myRedisDatabasePage.importDialogTitle.textContent).eql('Import Results', `Databases from ${fileParameters.type} not imported`);
+            .click(myRedisDatabasePage.submitChangesButton)
+            .expect(myRedisDatabasePage.successResultsAccordion.exists).ok(`Databases from ${fileParameters.type} not imported`);
     }
 
     /**

tests/e2e/desktop.runner.ci.ts

@@ -40,9 +40,7 @@ import testcafe from 'testcafe';
                     speed: 1,
                     quarantineMode: { successThreshold: 1, attemptLimit: 3 },
                     pageRequestTimeout: 20000,
-                    disableMultipleWindows: true,
-                    runExecutionTimeout: 280000,
-                    testExecutionTimeout: 280000
+                    disableMultipleWindows: true
                 });
         })
         .then((failedCount) => {

tests/e2e/helpers/api/api-database.ts

@@ -7,7 +7,7 @@ import {
     databaseParameters,
     SentinelParameters,
     ClusterNodes
-} from '../../pageObjects/components/myRedisDatabase/add-redis-database';
+} from '../../pageObjects/dialogs/add-redis-database-dialog';
 import { ResourcePath } from '../constants';
 import {
     sendGetRequest,

tests/e2e/helpers/database.ts

@@ -3,7 +3,7 @@ import {
     AddNewDatabaseParameters,
     SentinelParameters,
     OSSClusterParameters
-} from '../pageObjects/components/myRedisDatabase/add-redis-database';
+} from '../pageObjects/dialogs/add-redis-database-dialog';
 import { DiscoverMasterGroupsPage } from '../pageObjects/sentinel/discovered-sentinel-master-groups-page';
 import {
     MyRedisDatabasePage,
@@ -14,6 +14,7 @@ import { UserAgreementDialog } from '../pageObjects/dialogs';
 import { DatabaseAPIRequests } from './api/api-database';
 import { RedisOverviewPage } from './constants';
 import { RdiInstancesListPage } from '../pageObjects/rdi-instances-list-page';
+import { updateControlNumber } from './insights';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const discoverMasterGroupsPage = new DiscoverMasterGroupsPage();
@@ -32,12 +33,12 @@ export class DatabaseHelper {
         databaseParameters: AddNewDatabaseParameters
     ): Promise<void> {
         // Fill the add database form
-        await myRedisDatabasePage.AddRedisDatabase.addRedisDataBase(
+        await myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDataBase(
             databaseParameters
         );
         // Click for saving
         await t
-            .click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
+            .click(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton)
             // Wait for database to be exist
             .expect(
                 myRedisDatabasePage.dbNameList.withExactText(
@@ -57,13 +58,13 @@ export class DatabaseHelper {
         databaseParameters: SentinelParameters
     ): Promise<void> {
         // Fill sentinel parameters to auto-discover Master Groups
-        await myRedisDatabasePage.AddRedisDatabase.discoverSentinelDatabases(
+        await myRedisDatabasePage.AddRedisDatabaseDialog.discoverSentinelDatabases(
             databaseParameters
         );
         // Click for autodiscover
         await t
             .click(
-                myRedisDatabasePage.AddRedisDatabase
+                myRedisDatabasePage.AddRedisDatabaseDialog
                     .addRedisDatabaseButton
             )
             .expect(discoverMasterGroupsPage.addPrimaryGroupButton.exists)
@@ -83,12 +84,12 @@ export class DatabaseHelper {
         databaseParameters: AddNewDatabaseParameters
     ): Promise<void> {
         // Fill the add database form
-        await myRedisDatabasePage.AddRedisDatabase.addAutodiscoverREClusterDatabase(
+        await myRedisDatabasePage.AddRedisDatabaseDialog.addAutodiscoverREClusterDatabase(
             databaseParameters
         );
         // Click on submit button
         await t
-            .click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
+            .click(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton)
             // Wait for database to be exist in the list of Autodiscover databases and select it
             .expect(
                 autoDiscoverREDatabases.databaseName.withExactText(
@@ -114,12 +115,12 @@ export class DatabaseHelper {
         databaseParameters: OSSClusterParameters
     ): Promise<void> {
         // Enter required parameters for OSS Cluster
-        await myRedisDatabasePage.AddRedisDatabase.addOssClusterDatabase(
+        await myRedisDatabasePage.AddRedisDatabaseDialog.addOssClusterDatabase(
             databaseParameters
         );
         // Click for saving
         await t
-            .click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
+            .click(myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton)
             // Check for info message that DB was added
             .expect(myRedisDatabasePage.Toast.toastHeader.exists)
             .ok('Info message not exists', { timeout: 10000 })
@@ -142,12 +143,12 @@ export class DatabaseHelper {
         cloudAPISecretKey: string
     ): Promise<string> {
         // Fill the add database form and Submit
-        await myRedisDatabasePage.AddRedisDatabase.addAutodiscoverRECloudDatabase(
+        await myRedisDatabasePage.AddRedisDatabaseDialog.addAutodiscoverRECloudDatabase(
             cloudAPIAccessKey,
             cloudAPISecretKey
         );
         await t.click(
-            myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton
+            myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton
         );
         await t
             .expect(
@@ -157,8 +158,8 @@ export class DatabaseHelper {
             )
             .ok('Subscriptions list not displayed', { timeout: 120000 });
         // Select subscriptions
-        await t.click(myRedisDatabasePage.AddRedisDatabase.selectAllCheckbox);
-        await t.click(myRedisDatabasePage.AddRedisDatabase.showDatabasesButton);
+        await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.selectAllCheckbox);
+        await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.showDatabasesButton);
         // Select databases for adding
         const databaseName = await autoDiscoverREDatabases.getDatabaseName();
         await t.click(autoDiscoverREDatabases.databaseCheckbox);
@@ -277,12 +278,12 @@ export class DatabaseHelper {
         const startTime = Date.now();
 
         await this.acceptLicenseTerms();
-        await myRedisDatabasePage.AddRedisDatabase.addRedisDataBase(
+        await myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDataBase(
             databaseParameters
         );
         // Click for saving
         await t.click(
-            myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton
+            myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton
         );
         await t.wait(3000);
         // Reload page until db appears
@@ -320,12 +321,12 @@ export class DatabaseHelper {
         );
         const startTime = Date.now();
 
-        await myRedisDatabasePage.AddRedisDatabase.addRedisDataBase(
+        await myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDataBase(
             databaseParameters
         );
         // Click for saving
         await t.click(
-            myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton
+            myRedisDatabasePage.AddRedisDatabaseDialog.addRedisDatabaseButton
         );
         await t.wait(3000);
         // Reload page until db appears
@@ -348,13 +349,14 @@ export class DatabaseHelper {
     async acceptLicenseTerms(): Promise<void> {
         await t.maximizeWindow();
         await userAgreementDialog.acceptLicenseTerms();
+        await updateControlNumber(48.2);
         // Open default databases list tab if RDI opened
         if (await rdiInstancesListPage.rdiInstanceButton.exists) {
             await myRedisDatabasePage.setActivePage(RedisOverviewPage.DataBase);
         }
         // TODO delete after releasing chatbot
-        if (await myRedisDatabasePage.AddRedisDatabase.aiChatMessage.exists) {
-            await t.click(myRedisDatabasePage.AddRedisDatabase.aiCloseMessage)
+        if (await myRedisDatabasePage.AddRedisDatabaseDialog.aiChatMessage.exists) {
+            await t.click(myRedisDatabasePage.AddRedisDatabaseDialog.aiCloseMessage)
         }
     }
 
@@ -365,7 +367,7 @@ export class DatabaseHelper {
         await t
             .click(myRedisDatabasePage.NavigationPanel.myRedisDBButton)
             .click(
-                myRedisDatabasePage.AddRedisDatabase.connectToRedisStackButton
+                myRedisDatabasePage.AddRedisDatabaseDialog.connectToRedisStackButton
             );
     }
 
@@ -376,7 +378,7 @@ export class DatabaseHelper {
     async deleteDatabase(databaseName: string): Promise<void> {
         await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
         if (
-            await myRedisDatabasePage.AddRedisDatabase.addDatabaseButton.exists
+            await myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton.exists
         ) {
             await this.deleteDatabaseByNameApi(databaseName);
         }
@@ -389,7 +391,7 @@ export class DatabaseHelper {
     async deleteCustomDatabase(databaseName: string): Promise<void> {
         await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
         if (
-            await myRedisDatabasePage.AddRedisDatabase.addDatabaseButton.exists
+            await myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton.exists
         ) {
             await myRedisDatabasePage.deleteDatabaseByName(databaseName);
         }
@@ -404,7 +406,7 @@ export class DatabaseHelper {
         databaseParameters: AddNewDatabaseParameters
     ): Promise<void> {
         if (
-            await myRedisDatabasePage.AddRedisDatabase.addDatabaseButton.exists
+            await myRedisDatabasePage.AddRedisDatabaseDialog.addDatabaseButton.exists
         ) {
             await this.acceptLicenseTermsAndAddDatabase(databaseParameters);
         }

tests/e2e/helpers/insights.ts

@@ -1,10 +1,9 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
-import { BasePage } from '../pageObjects';
 import { syncFeaturesApi } from './api/api-info';
 import { DatabaseScripts, DbTableParameters } from './database-scripts';
+import { t } from 'testcafe';
 
-const basePage = new BasePage();
 const dbTableParams: DbTableParameters = {
     tableName: 'features_config',
     columnName: 'controlNumber',
@@ -41,7 +40,7 @@ export async function updateControlNumber(controlNumber: number): Promise<void>
     await syncFeaturesApi();
     await DatabaseScripts.updateColumnValueInDBTable({ ...dbTableParams, rowValue: controlNumber });
     await syncFeaturesApi();
-    await basePage.reloadPage();
+    await t.eval(() => location.reload());
 }
 
 /**

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/index.html,spec -e -s takeOnFails=true,path=report/screenshots/,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png",
+    "test:chrome": "ts-node ./web.runner.ts",
     "test:chrome:ci": "ts-node ./web.runner.ci.ts",
     "test": "yarn test:chrome",
     "lint": "eslint . --ext .ts,.js,.tsx,.jsx",

tests/e2e/pageObjects/components/myRedisDatabase/add-redis-database.ts → tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts

@@ -1,8 +1,8 @@
 import { Selector, t } from 'testcafe';
-import { TlsCertificates } from '../../../helpers/constants';
-import { RedisCloudSigninPanel } from '../redis-cloud-sign-in-panel';
+import { TlsCertificates } from '../../helpers/constants';
+import { RedisCloudSigninPanel } from '../components/redis-cloud-sign-in-panel';
 
-export class AddRedisDatabase {
+export class AddRedisDatabaseDialog {
     RedisCloudSigninPanel = new RedisCloudSigninPanel();
 
     //-------------------------------------------------------------------------------------------
@@ -14,8 +14,9 @@ export class AddRedisDatabase {
     // BUTTONS
     addDatabaseButton = Selector('[data-testid^=add-redis-database]');
     addRedisDatabaseButton = Selector('[data-testid=btn-submit]');
-    addDatabaseManually = Selector('[data-testid=add-manual]');
-    addAutoDiscoverDatabase = Selector('[data-testid=add-auto]');
+    addDatabaseManually = Selector('[data-testid=add-database_tab_manual]');
+    addAutoDiscoverDatabase = Selector('[data-testid=add-database_tab_software]');
+    addCloudDatabaseTab = Selector('[data-testid=add-database_tab_cloud]');
     redisClusterType = Selector('[data-test-subj=radio-btn-enterprise-cluster]');
     redisCloudProType = Selector('[data-test-subj=radio-btn-cloud-pro]');
     redisSentinelType = Selector('[data-test-subj=radio-btn-sentinel]');
@@ -27,9 +28,7 @@ export class AddRedisDatabase {
     connectToRedisStackButton = Selector('[aria-label="Connect to database"]');
     cloneDatabaseButton = Selector('[data-testid=clone-db-btn]');
     sentinelNavigation = Selector('[data-testid=sentinel-nav-group]');
-    cloneSentinelNavigation = Selector('[data-testid=sentinel-nav-group-clone]');
     sentinelDatabaseNavigation = Selector('[data-testid=database-nav-group]');
-    cloneSentinelDatabaseNavigation = Selector('[data-testid=database-nav-group-clone]');
     cancelButton = Selector('[data-testid=btn-cancel]');
     showPasswordBtn = Selector('[aria-label^="Show password"]');
     testConnectionBtn = Selector('[data-testid=btn-test-connection]');
@@ -60,17 +59,17 @@ export class AddRedisDatabase {
     caCertField = Selector('[data-testid=select-ca-cert]', { timeout: 500 });
     clientCertField = Selector('[data-testid=select-cert]', { timeout: 500 });
     selectCompressor = Selector('[data-testid=select-compressor]', { timeout: 1000 });
-    useCloudAccount = Selector('[data-testid=use-cloud-account-accordion]');
-    useCloudKeys = Selector('[data-testid=use-cloud-keys-accordion]');
     certificateDropdownList = Selector('div.euiSuperSelect__listbox div');
-
     // CHECKBOXES
     useSSHCheckbox = Selector('[data-testid=use-ssh]~div', { timeout: 500 });
     dataCompressorCheckbox = Selector('[data-testid=showCompressor] ~ label');
     requiresTlsClientCheckbox = Selector('[data-testid=tls-required-checkbox]  ~ label');
+    useCloudAccount = Selector('#cloud-account').parent();
+    useCloudKeys = Selector('#cloud-api-keys').parent();
     // RADIO BUTTONS
     sshPasswordRadioBtn = Selector('#password~div', { timeout: 500 });
     sshPrivateKeyRadioBtn = Selector('#privateKey~div', { timeout: 500 });
+    cloudOptionsRadioBtn =  Selector('[data-testid=cloud-options]');
     // LABELS
     dataCompressorLabel = Selector('[data-testid=showCompressor] ~ label', { timeout: 1000 });
     aiChatMessage = Selector('[data-testid=ai-chat-message-btn]');
@@ -221,7 +220,7 @@ export class AddRedisDatabase {
 
         await t
             .click(this.addDatabaseButton)
-            .click(this.addAutoDiscoverDatabase);
+            .click(this.addCloudDatabaseTab);
 
         await t
             .typeText(this.accessKeyInput, cloudAPIAccessKey, { replace: true, paste: true })

tests/e2e/pageObjects/dialogs/index.ts

@@ -1,7 +1,12 @@
+import { AddRedisDatabaseDialog } from './add-redis-database-dialog';
+import { AuthorizationDialog } from './authorization-dialog';
 import { OnboardingCardsDialog } from './onboarding-cards-dialog';
 import { UserAgreementDialog } from './user-agreement-dialog';
 
+
 export {
+    AddRedisDatabaseDialog,
+    AuthorizationDialog,
     OnboardingCardsDialog,
     UserAgreementDialog
 };

tests/e2e/pageObjects/my-redis-databases-page.ts

@@ -1,19 +1,18 @@
 import { t, Selector } from 'testcafe';
 import { DatabaseAPIRequests } from '../helpers/api/api-database';
-import { AddRedisDatabase } from './components/myRedisDatabase/add-redis-database';
 import { InsightsPanel } from './components/insights-panel';
 import { BaseOverviewPage } from './base-overview-page';
 import { NavigationPanel } from './components/navigation-panel';
 import { NavigationHeader } from './components/navigation/navigation-header';
 import { AuthorizationDialog } from './dialogs/authorization-dialog';
-import { RedisCloudSigninPanel } from './components/redis-cloud-sign-in-panel';
+import { AddRedisDatabaseDialog } from './dialogs';
 
 const databaseAPIRequests = new DatabaseAPIRequests();
 
 export class MyRedisDatabasePage extends BaseOverviewPage {
 
     NavigationPanel = new NavigationPanel();
-    AddRedisDatabase = new AddRedisDatabase();
+    AddRedisDatabaseDialog = new AddRedisDatabaseDialog();
     InsightsPanel = new InsightsPanel();
     NavigationHeader = new NavigationHeader();
     AuthorizationDialog = new AuthorizationDialog();
@@ -33,19 +32,20 @@ export class MyRedisDatabasePage extends BaseOverviewPage {
     deleteButtonInPopover = Selector('#deletePopover button');
     confirmDeleteAllDbButton = Selector('[data-testid=delete-selected-dbs]');
     editDatabaseButton = Selector('[data-testid^=edit-instance]');
-    editAliasButton = Selector('[data-testid=edit-alias-btn]');
+    popoverHeader = Selector('#formModalHeader');
     submitChangesButton = Selector('[data-testid=btn-submit]');
     promoButton = Selector('[data-testid=promo-btn]');
     sortByDatabaseAlias = Selector('span').withAttribute('title', 'Database Alias');
     sortByHostAndPort = Selector('span').withAttribute('title', 'Host:Port');
     sortByConnectionType = Selector('span').withAttribute('title', 'Connection Type');
-    importDatabasesBtn = Selector('[data-testid=import-from-file-btn]');
+    importDatabasesBtn = Selector('[data-testid=add-database_tab_import]');
+    retryImportBtn = Selector('[data-testid=btn-retry]');
     submitImportBtn = Selector('[data-testid=submit-btn]');
-    okDialogBtn = Selector('[data-testid=ok-btn]');
     removeImportedFileBtn = Selector('[aria-label="Clear selected files"]');
     exportBtn = Selector('[data-testid=export-btn]');
     exportSelectedDbsBtn = Selector('[data-testid=export-selected-dbs]');
     userProfileBtn = Selector('[data-testid=user-profile-btn]');
+    closeImportBtn = Selector('[data-testid=btn-close]');
     //CHECKBOXES
     selectAllCheckbox = Selector('[data-test-subj=checkboxSelectAll]');
     exportPasswordsCheckbox = Selector('[data-testid=export-passwords]~div', { timeout: 500 });
@@ -74,19 +74,18 @@ export class MyRedisDatabasePage extends BaseOverviewPage {
     noResultsFoundMessage = Selector('div').withExactText('No results found');
     noResultsFoundText = Selector('div').withExactText('No results matched your search. Try reducing the criteria.');
     failedImportMessage = Selector('[data-testid=result-failed]');
-    importDialogTitle = Selector('[data-testid=import-file-modal-title]');
     importResult = Selector('[data-testid^=table-result-]');
     userProfileAccountInfo = Selector('[data-testid^=profile-account-]');
     portCloudDb = Selector('[class*=column_host]');
     // DIALOG
-    importDbDialog = Selector('[data-testid=import-file-modal]');
     successResultsAccordion = Selector('[data-testid^=success-results-]');
     partialResultsAccordion = Selector('[data-testid^=partial-results-]');
     failedResultsAccordion = Selector('[data-testid^=failed-results-]');
     // CONTAINERS
     databaseContainer = Selector('.databaseContainer');
     connectionTypeTitle  = Selector('[data-test-subj=tableHeaderCell_connectionType_2]');
     signInAgreement = Selector('[class="euiCheckbox__square"]');
+    addDatabaseImport = Selector('[data-testid=add-db_import]');
 
     /**
      * Click on the database by name