Merge pull request #3594 from RedisInsight/e2e/feature/RI-5902-rdi-integration

E2e/feature/ri 5902 rdi integration

Author: mariasergeenko

tests/e2e/package.json

@@ -25,7 +25,8 @@
   "author": "",
   "dependencies": {
     "axios": "^1.6.0",
-    "cli-argument-parser": "0.4.5"
+    "cli-argument-parser": "0.4.5",
+    "js-yaml": "^4.1.0"
   },
   "resolutions": {
     "@types/lodash": "4.14.192",

tests/e2e/pageObjects/components/monaco-editor.ts

@@ -20,6 +20,7 @@ export class MonacoEditor {
      * @param clean if  field should be cleaned
      */
     async sendTextToMonaco(input: Selector, command: string, clean = true): Promise<void> {
+
         await t.click(input);
         if(clean) {
             await t
@@ -30,6 +31,28 @@ export class MonacoEditor {
         await t.typeText(input, command);
     }
 
+    /**
+     * Send lines in monacoEditor without additional space that typeText can add
+     * @param input The input locator
+     * @param lines lines
+     * @param depth level of depth of the object
+     */
+    async insertTextByLines(input: Selector, lines: string[], depth: number): Promise<void> {
+        for(let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+
+            for(let j = 0; j < depth; j++) {
+                await t.pressKey('shift+tab');
+            }
+
+            if (line) {
+                await t.typeText(input, line, { paste: true });
+            }
+            await t.pressKey('esc');
+            await t.pressKey('enter');
+        }
+    }
+
     /**
      * Get text from monacoEditor
      */

tests/e2e/pageObjects/components/rdi/pipeline-management-panel.ts

@@ -11,9 +11,11 @@ export class PipelineManagementPanel {
 
     jobNameInput = Selector('[data-testid=inline-item-editor]');
     jobItem = Selector('[data-testid*=rdi-nav-job-actions]');
-    confirmBtn  = Selector('[data-testid=confirm-btn]');
+    confirmBtn  = Selector('[data-testid=delete-confirm-btn]');
     jobsPipelineTitle = Selector('[class*=rdi__title]');
 
+    configHighlightingIcon = Selector('[data-testid=updated-file-config-highlight]');
+
     /**
      * Add Job by name
      * @param name job name
@@ -28,7 +30,7 @@ export class PipelineManagementPanel {
      * @param name job name
      */
     async openJobByName(name: string): Promise<void> {
-        const jobBtnSelector = Selector(`[data-testid=rdi-nav-job-${name}]`);
+        const jobBtnSelector = await this.getJobByName(name);
         await t.click(jobBtnSelector);
     }
 
@@ -52,4 +54,12 @@ export class PipelineManagementPanel {
             .typeText(this.jobNameInput, newName, { replace: true })
             .click(this.EditorButton.applyBtn);
     }
+
+    /**
+     * Get Job by name
+     * @param name job name
+     */
+    async getJobByName(name: string): Promise<Selector> {
+        return Selector(`[data-testid=rdi-nav-job-${name}]`);
+    }
 }

tests/e2e/pageObjects/components/rdi/rdi-header.ts

@@ -11,10 +11,11 @@ export class RdiHeader {
     deployConfirmBtn = Selector('[data-testid=deploy-confirm-btn]');
 
     uploadPipelineButton = Selector('[data-testid=upload-pipeline-btn]');
+    uploadConfirmPipelineButton = Selector('[data-testid=upload-confirm-btn]');
     uploadFromFileButton = Selector('[data-testid=upload-file-btn]');
     downloadPipelineButton = Selector('[data-testid=download-pipeline-btn]');
     importInput = Selector('[data-testid=import-file-modal-filepicker]');
-    confirmUploadingPipelineBatton = Selector('[data-testid=upload-confirm-btn]');
+    confirmUploadingPipelineBatton = Selector('[data-testid=submit-btn]');
 
     cloudSignInButton = Selector('[data-testid=cloud-sign-in-btn]');
 

tests/e2e/pageObjects/components/rdi/test-connection-panel.ts

@@ -4,11 +4,8 @@ import { TextConnectionSection } from '../../../helpers/constants';
 export class TestConnectionPanel {
     endpointRowString = '[data-testid^=table-endpoint]';
 
-    sidePanel = Selector('[data-testid=test-connection-panel]');
-    successfulSection = Selector('[data-testid^=success-connections]');
-    failedSection = Selector('[data-testid^=failed-connections-]');
-    endpointRow = Selector(this.endpointRowString);
-    closeSection = Selector('[data-testid=close-test-connections-btn]');
+    targetName = Selector('[data-testid=table-target-target]');
+    resultText = Selector('[data-testid=table-result-target]');
 
     /**
      * Open/Close  section
@@ -23,35 +20,4 @@ export class TestConnectionPanel {
             await t.click(sectionSelector.find('button'));
         }
     }
-
-    /**
-     * get number of connection
-     * @param section Name of section
-     * @param state State of section
-     */
-    async getNumberOfSection(section: TextConnectionSection): Promise<string> {
-        const sectionSelector = Selector(`[data-testid^=${section}-connections-]`);
-        return sectionSelector.find('span[data-testid="number-of-connections"]').textContent;
-    }
-
-    /**
-     * get row count in the section
-     * @param section Name of section
-     */
-    async getNumberOfSectionRow(section: TextConnectionSection): Promise<string> {
-        const sectionSelector = Selector(`[data-testid^=${section}-connections-]`);
-        const rows =  await sectionSelector.find('[data-testid^=table-endpoint]').count;
-        return rows.toString();
-    }
-
-    /**
-     * get row endpoint text by index
-     * @param section Name of section
-     * @param index index of the row to get text
-     */
-    async getSectionRowTextByIndex(section: TextConnectionSection, index: number): Promise<string> {
-        const sectionSelector = Selector(`[data-testid^=${section}-connections-]`);
-        return await (sectionSelector.find(this.endpointRowString).nth(index)).textContent;
-    }
-
 }

tests/e2e/pageObjects/rdi-instance-page.ts

@@ -15,7 +15,7 @@ export class RdiInstancePage extends BaseOverviewPage {
     RdiHeader = new RdiHeader();
     MonacoEditor = new MonacoEditor();
 
-    dryRunButton = Selector('[data-testid=rdi-jobs-dry-run]');
+    dryRunButton = Selector('[data-testid=rdi-job-dry-run]');
     dryRunSubmitBtn = Selector('[data-testid=dry-run-btn]');
     closeDryRunPanelBtn = Selector('[data-testid=close-dry-run-btn]');
     dryRunPanel = Selector('[data-testid=dry-run-panel]');
@@ -28,6 +28,8 @@ export class RdiInstancePage extends BaseOverviewPage {
     okUploadPipelineBtn = Selector('[data-testid=ok-btn]');
     closeImportModelBtn = Selector('[data-testid=import-file-modal] button');
 
+    loadingIndicator = Selector('[class*=rdi__loading]');
+
     configurationInput = Selector('[data-testid=wrapper-rdi-monaco-config]');
     configurationLink = Selector('[data-testid=rdi-pipeline-config-link]');
 
@@ -38,7 +40,6 @@ export class RdiInstancePage extends BaseOverviewPage {
     jmesPathOption = Selector('[id=jmespath]');
     sqlEditorButton = Selector('[data-testid=open-dedicated-editor-btn]');
 
-    successDeployNotification = Selector('[data-testid=success-deploy-pipeline-notification]');
     errorDeployNotification = Selector('[data-test-subj=toast-error-deploy]');
     failedUploadingPipelineNotification = Selector('[data-testid=result-failed]');
     closeNotification =  Selector('[class*=euiModal__closeIcon]');

tests/e2e/test-data/rdi/RDIPipeline.zip

@@ -15,9 +15,9 @@ const databaseHelper = new DatabaseHelper();
 
 const rdiInstance: AddNewRdiParameters = {
     name: 'testInstance',
-    url: 'http://localhost:4000',
+    url: 'https://11.111.111.111',
     username: 'username',
-    password: 'password'
+    password: '111'
 };
 
 //skip the tests until rdi integration is added
@@ -85,6 +85,7 @@ test('Verify that user insert template for jobs', async() => {
     // should be empty config
     await rdiInstancePage.PipelineManagementPanel.addJob(jobName);
 
+    await rdiInstancePage.PipelineManagementPanel.openJobByName(jobName);
     await t.expect(rdiInstancePage.templateApplyButton.visible).ok('the template popover is not expanded');
     const buttonClass = rdiInstancePage.templateApplyButton.getAttribute('class');
     await t.expect(buttonClass).notContains(disabledAttribute, 'Apply button is disabled');
@@ -94,7 +95,7 @@ test('Verify that user insert template for jobs', async() => {
     await t.click(rdiInstancePage.templateButton);
     await t.expect(rdiInstancePage.templateApplyButton.visible).ok('the template popover is not expanded');
     await t.expect(rdiInstancePage.pipelineDropdown.textContent).eql(defaultValue, 'the default value is set incorrectly');
-    await rdiInstancePage.setTemplateDropdownValue(RdiTemplatePipelineType.WriteBehind);
+    await rdiInstancePage.setTemplateDropdownValue(RdiTemplatePipelineType.Ingest);
 
     //verify uniq templates words - should be undated when templates are added
     const enteredText = await rdiInstancePage.MonacoEditor.getTextFromMonaco();
@@ -120,9 +121,9 @@ test('Verify that user can open an additional editor to work with SQL and JMESPa
     const jobName = 'testJob';
     const sqlText = 'SELECT test FROM test1';
     const SQLiteText = 's';
-    const SQLiteAutoCompleteText = 'STRFTIME(format, time_value)';
+    const SQLiteAutoCompleteText = 'SIGN(X)';
     const JMESPathText = 'r';
-    const JMESPathAutoCompleteText = 'regex_replace';
+    const JMESPathAutoCompleteText = 'REGEX_REPLACE';
 
     await rdiInstancePage.PipelineManagementPanel.addJob(jobName);
     await rdiInstancePage.PipelineManagementPanel.openJobByName(jobName);
@@ -136,7 +137,7 @@ test('Verify that user can open an additional editor to work with SQL and JMESPa
     await t.expect(rdiInstancePage.draggableArea.exists).ok('SQL/JMESPath editor is not displayed');
 
     // Verify that user can see SQL(set by default) and JMESPath editor options
-    await t.expect(rdiInstancePage.dedicatedLanguageSelect.textContent).eql('SQL', 'SQL is not set by default');
+    await t.expect(rdiInstancePage.dedicatedLanguageSelect.textContent).eql('SQLite functions', 'SQL is not set by default');
 
     // Verify that user can close the additional editor
     await rdiInstancePage.MonacoEditor.sendTextToMonaco(rdiInstancePage.draggableArea, sqlText, false);
@@ -158,7 +159,7 @@ test('Verify that user can open an additional editor to work with SQL and JMESPa
     // Start type characters and select command
     await rdiInstancePage.MonacoEditor.sendTextToMonaco(rdiInstancePage.draggableArea, JMESPathText);
     // Verify that the list with auto-suggestions is displayed
-    await t.expect(rdiInstancePage.MonacoEditor.monacoSuggestion.count).eql(3, 'Auto-suggestions are not displayed');
+    await t.expect(rdiInstancePage.MonacoEditor.monacoSuggestion.count).gt(1, 'Auto-suggestions are not displayed');
     await t.pressKey('tab');
     await t.click(rdiInstancePage.EditorButton.applyBtn);
     await t.expect(await rdiInstancePage.MonacoEditor.getTextFromMonaco()).contains(JMESPathAutoCompleteText, 'Text from JMESPath editor not applied');
@@ -168,7 +169,7 @@ test('Verify that user can open an additional editor to work with SQL and JMESPa
     // Start type characters and select command
     await rdiInstancePage.MonacoEditor.sendTextToMonaco(rdiInstancePage.draggableArea, SQLiteText);
     // Verify that the list with auto-suggestions is displayed
-    await t.expect(rdiInstancePage.MonacoEditor.monacoSuggestion.count).eql(3, 'Auto-suggestions are not displayed');
+    await t.expect(rdiInstancePage.MonacoEditor.monacoSuggestion.count).gt(1, 'Auto-suggestions are not displayed');
     await t.pressKey('tab');
     await t.click(rdiInstancePage.EditorButton.applyBtn);
     await t.expect(await rdiInstancePage.MonacoEditor.getTextFromMonaco()).contains(SQLiteAutoCompleteText, 'Text from SQLite editor not applied');