Merge pull request #2057 from RedisInsight/e2e/feature/RI-4352_bulk-upload-from-tutorials

E2e/feature/ri 4352 bulk upload from tutorials

Author: vlad-dargel

tests/e2e/helpers/common.ts

@@ -1,3 +1,6 @@
+import * as path from 'path';
+import * as archiver from 'archiver';
+import * as fs from 'fs';
 import { ClientFunction, RequestMock, t } from 'testcafe';
 import { Chance } from 'chance';
 import { apiUrl, commonUrl } from './conf';
@@ -188,4 +191,30 @@ export class Common {
     static async getPageUrl(): Promise<string> {
         return (await ClientFunction(() => window.location.href))();
     }
+
+    /**
+      * Create Zip archive from folder
+      * @param folderPath Path to folder to archive
+      * @param zipName Zip archive name
+     */
+    static async createZipFromFolder(folderPath: string, zipName: string): Promise<void> {
+        const sourceDir = path.join(__dirname, folderPath);
+        const zipFilePath = path.join(__dirname, zipName);
+        const output = fs.createWriteStream(zipFilePath);
+        const archive = archiver('zip', { zlib: { level: 9 } });
+
+        // Add the contents of the directory to the zip archive
+        archive.directory(sourceDir, false);
+        // Finalize the archive and write it to disk
+        await archive.finalize();
+        archive.pipe(output);
+    }
+
+    /**
+      * Delete file from folder
+      * @param folderPath Path to file
+     */
+    static async deleteFileFromFolder(filePath: string): Promise<void> {
+        fs.unlinkSync(path.join(__dirname, filePath));
+    }
 }

tests/e2e/helpers/database.ts

@@ -28,7 +28,7 @@ export async function addNewStandaloneDatabase(databaseParameters: AddNewDatabas
     // Wait for database to be exist
         .expect(myRedisDatabasePage.dbNameList.withExactText(databaseParameters.databaseName ?? '').exists).ok('The database not displayed', { timeout: 10000 })
     // Close message
-        .click(myRedisDatabasePage.toastCloseButton);
+        .click(myRedisDatabasePage.Toast.toastCloseButton);
 }
 
 /**
@@ -77,7 +77,7 @@ export async function addOSSClusterDatabase(databaseParameters: OSSClusterParame
     await t
         .click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
     // Check for info message that DB was added
-        .expect(myRedisDatabasePage.databaseInfoMessage.exists).ok('Info message not exists', { timeout: 10000 })
+        .expect(myRedisDatabasePage.Toast.toastHeader.exists).ok('Info message not exists', { timeout: 10000 })
     // Wait for database to be exist
         .expect(myRedisDatabasePage.dbNameList.withExactText(databaseParameters.ossClusterDatabaseName).exists).ok('The database not displayed', { timeout: 10000 });
 }

tests/e2e/package.json

@@ -30,11 +30,13 @@
     "@types/node": "18.11.9"
   },
   "devDependencies": {
+    "@types/archiver": "^5.3.2",
     "@types/chance": "1.1.3",
     "@types/edit-json-file": "1.7.0",
     "@types/supertest": "^2.0.8",
     "@typescript-eslint/eslint-plugin": "4.28.2",
     "@typescript-eslint/parser": "4.28.2",
+    "archiver": "^5.3.1",
     "chance": "1.1.8",
     "cross-env": "^7.0.3",
     "dotenv-cli": "^5.0.0",

tests/e2e/pageObjects/base-page.ts

@@ -1,8 +1,10 @@
 import { t } from 'testcafe';
 import { NavigationPanel } from './components/navigation-panel';
+import { Toast } from './components/toast';
 
 export class BasePage {
     NavigationPanel = new NavigationPanel();
+    Toast = new Toast();
 
     /**
      * Reload page

tests/e2e/pageObjects/browser-page.ts

@@ -61,7 +61,6 @@ export class BrowserPage extends InstancePage {
     addJsonObjectButton = Selector('[data-testid=add-object-btn]');
     addJsonFieldButton = Selector('[data-testid=add-field-btn]');
     expandJsonObject = Selector('[data-testid=expand-object]');
-    toastCloseButton = Selector('[data-test-subj=toastCloseButton]');
     scoreButton = Selector('[data-testid=score-button]');
     sortingButton = Selector('[data-testid=header-sorting-button]');
     editJsonObjectButton = Selector('[data-testid=edit-object-btn]');
@@ -103,7 +102,6 @@ export class BrowserPage extends InstancePage {
     editZsetButton = Selector('[data-testid^=zset-edit-button-]');
     editListButton = Selector('[data-testid^=edit-list-button-]');
     cancelStreamGroupBtn = Selector('[data-testid=cancel-stream-groups-btn]');
-    submitTooltipBtn = Selector('[data-testid=submit-tooltip-btn]');
     patternModeBtn = Selector('[data-testid=search-mode-pattern-btn]');
     redisearchModeBtn = Selector('[data-testid=search-mode-redisearch-btn]');
     showFilterHistoryBtn = Selector('[data-testid=show-suggestions-btn]');
@@ -198,7 +196,6 @@ export class BrowserPage extends InstancePage {
     //TEXT ELEMENTS
     keySizeDetails = Selector('[data-testid=key-size-text]');
     keyLengthDetails = Selector('[data-testid=key-length-text]');
-    notificationMessage = Selector('[data-test-subj=euiToastHeader]');
     keyNameInTheList = Selector(this.cssSelectorKey);
     databaseNames = Selector('[data-testid^=db_name_]');
     hashFieldsList = Selector('[data-testid^=hash-field-] span');
@@ -265,7 +262,6 @@ export class BrowserPage extends InstancePage {
     streamConsumerName = Selector('[data-testid^=stream-consumer-]');
     consumerGroup = Selector('[data-testid^=stream-group-]');
     entryIdInfoIcon = Selector('[data-testid=entry-id-info-icon]');
-    errorMessage = Selector('[data-test-subj=toast-error]');
     entryIdError = Selector('[data-testid=id-error]');
     pendingCount = Selector('[data-testid=pending-count]');
     lastRefreshMessage = Selector('[data-testid=refresh-message]');
@@ -442,7 +438,7 @@ export class BrowserPage extends InstancePage {
         await t.typeText(this.streamValue, value, { replace: true, paste: true });
         await t.expect(this.addKeyButton.withAttribute('disabled').exists).notOk('Add Key button not clickable');
         await t.click(this.addKeyButton);
-        await t.click(this.toastCloseButton);
+        await t.click(this.Toast.toastCloseButton);
     }
 
     /**
@@ -545,15 +541,10 @@ export class BrowserPage extends InstancePage {
         return keyNameInTheList.exists;
     }
 
-    //Getting the text of the Notification message
-    async getMessageText(): Promise<string> {
-        return this.notificationMessage.textContent;
-    }
-
     //Delete key from details
     async deleteKey(): Promise<void> {
-        if (await this.toastCloseButton.exists) {
-            await t.click(this.toastCloseButton);
+        if (await this.Toast.toastCloseButton.exists) {
+            await t.click(this.Toast.toastCloseButton);
         }
         await t.click(this.keyNameInTheList);
         await t.click(this.deleteKeyButton);
@@ -640,8 +631,8 @@ export class BrowserPage extends InstancePage {
      * @param keyValue The hash value
      */
     async addFieldToHash(keyFieldValue: string, keyValue: string): Promise<void> {
-        if (await this.toastCloseButton.exists) {
-            await t.click(this.toastCloseButton);
+        if (await this.Toast.toastCloseButton.exists) {
+            await t.click(this.Toast.toastCloseButton);
         }
         await t.click(this.addKeyValueItemsButton);
         await t.typeText(this.hashFieldInput, keyFieldValue, { replace: true, paste: true });
@@ -734,8 +725,8 @@ export class BrowserPage extends InstancePage {
      * @param keyMember The value of the set member
      */
     async addMemberToSet(keyMember: string): Promise<void> {
-        if (await this.toastCloseButton.exists) {
-            await t.click(this.toastCloseButton);
+        if (await this.Toast.toastCloseButton.exists) {
+            await t.click(this.Toast.toastCloseButton);
         }
         await t
             .click(this.addKeyValueItemsButton)
@@ -749,8 +740,8 @@ export class BrowserPage extends InstancePage {
      * @param score The value of the score
      */
     async addMemberToZSet(keyMember: string, score: string): Promise<void> {
-        if (await this.toastCloseButton.exists) {
-            await t.click(this.toastCloseButton);
+        if (await this.Toast.toastCloseButton.exists) {
+            await t.click(this.Toast.toastCloseButton);
         }
         await t
             .click(this.addKeyValueItemsButton)
@@ -784,8 +775,8 @@ export class BrowserPage extends InstancePage {
      * @param element The value of the list element
      */
     async addElementToList(element: string): Promise<void> {
-        if (await this.toastCloseButton.exists) {
-            await t.click(this.toastCloseButton);
+        if (await this.Toast.toastCloseButton.exists) {
+            await t.click(this.Toast.toastCloseButton);
         }
         await t
             .click(this.addKeyValueItemsButton)

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

@@ -40,7 +40,6 @@ export class AddRedisDatabase {
     secretKeyInput = Selector('[data-testid=secret-key]');
     welcomePageTitle = Selector('[data-testid=welcome-page-title]');
     databaseIndexInput = Selector('[data-testid=db]');
-    errorMessage = Selector('[data-test-subj=toast-error]');
     databaseIndexMessage = Selector('[data-testid=db-index-message]');
     primaryGroupNameInput = Selector('[data-testid=primary-group]');
     masterGroupPassword = Selector('[data-testid=sentinel-master-password]');

tests/e2e/pageObjects/components/toast.ts

@@ -0,0 +1,11 @@
+import { Selector } from 'testcafe';
+
+export class Toast {
+    toastHeader = Selector('[data-test-subj=euiToastHeader]');
+    toastBody = Selector('[class*=euiToastBody]');
+    toastSuccess = Selector('[class*=euiToast--success]');
+    toastError = Selector('[class*=euiToast--danger]');
+    toastCloseButton = Selector('[data-test-subj=toastCloseButton]');
+    toastSubmitBtn = Selector('[data-testid=submit-tooltip-btn]');
+    toastCancelBtn = Selector('[data-testid=toast-cancel-btn]');
+}

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

@@ -18,7 +18,7 @@ export class MyRedisDatabasePage extends BasePage {
     //BUTTONS
     deleteDatabaseButton = Selector('[data-testid^=delete-instance-]');
     confirmDeleteButton = Selector('[data-testid^=delete-instance-]').withExactText('Remove');
-    toastCloseButton = Selector('[data-test-subj=toastCloseButton]');
+    
     deleteButtonInPopover = Selector('#deletePopover button');
     confirmDeleteAllDbButton = Selector('[data-testid=delete-selected-dbs]');
     editDatabaseButton = Selector('[data-testid^=edit-instance]');
@@ -60,7 +60,6 @@ export class MyRedisDatabasePage extends BasePage {
     moduleQuantifier = Selector('[data-testid=_module]');
     dbNameList = Selector('[data-testid^=instance-name]', { timeout: 3000 });
     tableRowContent = Selector('[data-test-subj=database-alias-column]');
-    databaseInfoMessage = Selector('[data-test-subj=euiToastHeader]');
     hostPort = Selector('[data-testid=host-port]');
     noResultsFoundMessage = Selector('div').withExactText('No results found');
     noResultsFoundText = Selector('div').withExactText('No databases matched your search. Try reducing the criteria.');
@@ -79,8 +78,8 @@ export class MyRedisDatabasePage extends BasePage {
      * @param dbName The name of the database to be opened
      */
     async clickOnDBByName(dbName: string): Promise<void> {
-        if (await this.toastCloseButton.exists) {
-            await t.click(this.toastCloseButton);
+        if (await this.Toast.toastCloseButton.exists) {
+            await t.click(this.Toast.toastCloseButton);
         }
         const db = this.dbNameList.withExactText(dbName.trim());
         await t.expect(db.exists).ok(`"${dbName}" database doesn't exist`, {timeout: 10000});
@@ -103,8 +102,8 @@ export class MyRedisDatabasePage extends BasePage {
                 .click(this.deleteDatabaseButton)
                 .click(this.confirmDeleteButton);
         }
-        if (await this.toastCloseButton.exists) {
-            await t.click(this.toastCloseButton);
+        if (await this.Toast.toastCloseButton.exists) {
+            await t.click(this.Toast.toastCloseButton);
         }
     }
 

tests/e2e/pageObjects/workbench-page.ts

@@ -25,6 +25,7 @@ export class WorkbenchPage extends InstancePage {
     cssCustomPluginTableResult = '[data-testid^=query-table-result-client]';
     cssCommandExecutionDateTime = '[data-testid=command-execution-date-time]';
     cssRowInVirtualizedTable = '[data-testid^=row-]';
+    cssTutorialDeleteIcon = '[data-testid^=delete-tutorial-icon-]';
     //-------------------------------------------------------------------------------------------
     //DECLARATION OF SELECTORS
     //*Declare all elements/components of the relevant page.
@@ -37,7 +38,7 @@ export class WorkbenchPage extends InstancePage {
     tutorialOpenUploadButton = Selector('[data-testid=open-upload-tutorial-btn]');
     tutorialLinkField = Selector('[data-testid=tutorial-link-field]');
     tutorialLatestDeleteIcon = Selector('[data-testid^=delete-tutorial-icon-]').nth(0);
-    tutorialDeleteButton = Selector('[data-testid^=delete-tutorial-]').withText('Delete');
+    tutorialDeleteButton = Selector('button[data-testid^=delete-tutorial-]');
     tutorialNameField = Selector('[data-testid=tutorial-name-field]');
     tutorialSubmitButton = Selector('[data-testid=submit-upload-tutorial-btn]');
     tutorialImport = Selector('[data-testid=import-tutorial]');
@@ -80,6 +81,8 @@ export class WorkbenchPage extends InstancePage {
     copyCommand = Selector('[data-testid=copy-command]');
     redisStackTimeSeriesLoadMorePoints = Selector('[data-testid=preselect-Load more data points]');
     documentHashCreateButton = Selector('[data-testid=preselect-auto-Create]');
+    uploadDataBulkBtn = Selector('[data-testid=upload-data-bulk-btn]');
+    uploadDataBulkApplyBtn = Selector('[data-testid=upload-data-bulk-apply-btn]');
     //ICONS
     noCommandHistoryIcon = Selector('[data-testid=wb_no-results__icon]');
     parametersAnchor = Selector('[data-testid=parameters-anchor]');
@@ -248,39 +251,52 @@ export class WorkbenchPage extends InstancePage {
      * Get selector with tutorial name
      * @param tutorialName name of the uploaded tutorial
      */
-    async getAccordionButtonWithName(tutorialName: string): Promise<Selector> {
+    getAccordionButtonWithName(tutorialName: string): Selector {
         return Selector(`[data-testid=accordion-button-${tutorialName}]`);
     }
 
     /**
      * Get internal tutorial link with .md name
      * @param internalLink name of the .md file
      */
-    async getInternalLinkWithManifest(internalLink: string): Promise<Selector> {
+    getInternalLinkWithManifest(internalLink: string): Selector {
         return Selector(`[data-testid="internal-link-${internalLink}.md"]`);
     }
 
     /**
      * Get internal tutorial link without .md name
      * @param internalLink name of the label
      */
-    async getInternalLinkWithoutManifest(internalLink: string): Promise<Selector> {
+    getInternalLinkWithoutManifest(internalLink: string): Selector {
         return Selector(`[data-testid="internal-link-${internalLink}"]`);
     }
 
     /**
      * Find tutorial selector by name
      * @param name A tutorial name
      */
-    async getTutorialByName(name: string): Promise<Selector> {
+    getTutorialByName(name: string): Selector {
         return Selector('div').withText(name);
     }
 
+    /**
+     * Delete tutorial by name
+     * @param name A tutorial name
+     */
+    async deleteTutorialByName(name: string): Promise<void> {
+        const deleteTutorialBtn = this.tutorialAccordionButton.withText(name).find(this.cssTutorialDeleteIcon);
+        if (await this.closeEnablementPage.exists) {
+            await t.click(this.closeEnablementPage);
+        }
+        await t.click(deleteTutorialBtn);
+        await t.click(this.tutorialDeleteButton);
+    }
+
     /**
      * Find image in tutorial by alt text
      * @param alt Image alt text
      */
-    async getTutorialImageByAlt(alt: string): Promise<Selector> {
+    getTutorialImageByAlt(alt: string): Selector {
         return Selector('img').withAttribute('alt', alt);
     }