updated and add tests #2

mariasergeenko · mariasergeenko · commit 6bccb0afaeee · 2024-07-07T13:17:25.000+02:00
diff --git a/tests/e2e/pageObjects/components/rdi/test-connection-panel.ts b/tests/e2e/pageObjects/components/rdi/test-connection-panel.ts
@@ -4,12 +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
@@ -24,25 +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 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;
-    }
-
 }
diff --git a/tests/e2e/test-data/rdi/RDI_pipelineConfigurations.zip b/tests/e2e/test-data/rdi/RDI_pipelineConfigurations.zip
diff --git a/tests/e2e/tests/web/critical-path/rdi/add-job.e2e.ts b/tests/e2e/tests/web/critical-path/rdi/add-job.e2e.ts
@@ -15,7 +15,7 @@ const databaseHelper = new DatabaseHelper();
 
 const rdiInstance: AddNewRdiParameters = {
     name: 'testInstance',
-    url: 'https://54.175.165.214',
+    url: 'https://11.111.111.111',
     username: 'username',
     password: 'v3rY$tronGPa33w0Rd3ECDb'
 };
diff --git a/tests/e2e/tests/web/critical-path/rdi/add-rdi-instance.e2e.ts b/tests/e2e/tests/web/critical-path/rdi/add-rdi-instance.e2e.ts
@@ -20,22 +20,22 @@ const rdiApiRequests = new RdiApiRequests();
 
 const rdiInstance: RdiInstance = {
     alias: 'Alias',
-    url: 'https://54.175.165.214',
+    url: 'https://11.111.111.111',
     username: 'username',
     password: 'v3rY$tronGPa33w0Rd3ECDb',
     version: '1.2'
 };
 const rdiInstance2: RdiInstance = {
     alias: 'test',
-    url: 'https://54.175.165.214',
+    url: 'https://11.111.111.111',
     username: 'name',
     password: 'v3rY$tronGPa33w0Rd3ECDb',
     version: '1.2'
 };
 
 const rdiInstance3: RdiInstance = {
     alias: 'first',
-    url: 'https://54.175.165.214',
+    url: 'https://11.111.111.111',
     username: 'name',
     password: 'v3rY$tronGPa33w0Rd3ECDb',
     version: '1.2'
@@ -150,7 +150,7 @@ test('Verify that button is displayed if user does not enter all mandatory infor
 });
 test('Verify that user can see the Redis Data Integration message on the empty RDI list', async t => {
     const noInstancesMessage = 'Redis Data Integration (RDI) synchronizes data from your existing database into Redis in near-real-time. We\'ve done the heavy lifting so you can turn slow data into fast data without coding.';
-    const externalPageLink = 'https://redis.io/docs/latest/integrate/redis-data-integration/ingest/quick-start-guide/?utm_source=redisinsight&utm_medium=rdi&utm_campaign=rdi_list'
+    const externalPageLink = 'https://redis.io/docs/latest/integrate/redis-data-integration/ingest/quick-start-guide/?utm_source=redisinsight&utm_medium=rdi&utm_campaign=rdi_list';
 
     await t.expect(rdiInstancesListPage.emptyRdiList.withText(noInstancesMessage).exists).ok('Empty RDI page message not displayed');
 
diff --git a/tests/e2e/tests/web/critical-path/rdi/configuration.e2e.ts b/tests/e2e/tests/web/critical-path/rdi/configuration.e2e.ts
@@ -1,6 +1,6 @@
+import * as path from 'path';
 import { ClientFunction, t } from 'testcafe';
 import * as yaml from 'js-yaml';
-import * as path from 'path';
 import { RdiInstancePage } from '../../../../pageObjects/rdi-instance-page';
 import { AddNewRdiParameters, RdiApiRequests } from '../../../../helpers/api/api-rdi';
 import { cloudDatabaseConfig, commonUrl } from '../../../../helpers/conf';
@@ -15,24 +15,25 @@ import {
 } from '../../../../helpers/constants';
 import { DatabaseHelper } from '../../../../helpers';
 import { goBackHistory } from '../../../../helpers/utils';
-
+import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const rdiInstancePage = new RdiInstancePage();
 const rdiInstancesListPage = new RdiInstancesListPage();
 const rdiApiRequests = new RdiApiRequests();
 const databaseHelper = new DatabaseHelper();
+const databaseAPIRequests = new DatabaseAPIRequests();
 
 const rdiInstance: AddNewRdiParameters = {
     name: 'testInstance',
-    url: 'https://54.175.165.214',
+    url: 'https://11.111.111.111',
     username: 'username',
     password: 'v3rY$tronGPa33w0Rd3ECDb'
 };
 
 const getPageUrl = ClientFunction(() => window.location.href);
 
-const filePath = path.join('..', '..', '..', '..', 'test-data', 'rdi', 'RDI_pipelineConfig.zip');
+const filePath = path.join('..', '..', '..', '..', 'test-data', 'rdi', 'RDI_pipelineConfigurations.zip');
 
 //skip the tests until rdi integration is added
 fixture `Pipeline`
@@ -47,16 +48,18 @@ fixture `Pipeline`
         await rdiApiRequests.deleteAllRdiApi();
     });
 
-test.only('Verify that user can test connection', async() => {
+test.after(async() => {
+    // Delete databases
+    await databaseAPIRequests.deleteAllDatabasesApi();
+})('Verify that user can test connection', async() => {
     await myRedisDatabasePage.setActivePage(RedisOverviewPage.DataBase);
     await databaseHelper.autodiscoverRECloudDatabase(
-        //cloudDatabaseConfig.accessKey,
-        //cloudDatabaseConfig.secretKey
-        'A4wddpkno553qruhpsd670y8axe94warws3gbjbw896iyjf6dfl',
-        'S3xf5aiipy32nc9q7dyg8v4yhvf7x18i34euwilbcgrz02yjro5'
+        cloudDatabaseConfig.accessKey,
+        cloudDatabaseConfig.secretKey
     );
     const [host, port] = (await myRedisDatabasePage.hostPort.textContent).split(':');
-    //const password = cloudDatabaseConfig.databasePassword;
+    const password = cloudDatabaseConfig.databasePassword;
+    const errorText = 'Failed to connect to RDI database. Please verify host and port information.';
 
     const configData = {
         sources: {
@@ -80,21 +83,21 @@ test.only('Verify that user can test connection', async() => {
                 type: 'redis',
                 host,
                 port,
-                password: 'dd4oImrbinrNs1LXzKCtsnKjzLxZeaA2'
+                password: password
             }
         }
     };
     const config = yaml.dump(configData, { indent: 2 });
-
-    //fs.writeFileSync('config.yaml', yamlString, 'utf8');
     console.log(JSON.stringify(config));
+
     await myRedisDatabasePage.setActivePage(RedisOverviewPage.Rdi);
     await rdiInstancesListPage.clickRdiByName(rdiInstance.name);
     await rdiInstancePage.selectStartPipelineOption(RdiPopoverOptions.Pipeline);
     await t.click(rdiInstancePage.templateCancelButton);
 
     await t.click(rdiInstancePage.configurationInput);
     const lines = config.split('\n');
+    // the verable shows the level of object depth for input by line in monaco
     const maxLevelDepth = 3;
     const targetName = 'target';
 
@@ -108,11 +111,14 @@ test.only('Verify that user can test connection', async() => {
     await rdiInstancePage.RdiHeader.uploadPipeline(filePath);
     await t.click(rdiInstancePage.okUploadPipelineBtn);
     await t.click(rdiInstancePage.textConnectionBtn);
+    await rdiInstancePage.TestConnectionPanel.expandOrCollapseSection(TextConnectionSection.Failed, true);
+
+    await t.expect(await rdiInstancePage.TestConnectionPanel.resultText.textContent).eql(errorText);
 
 });
 test('Verify that link on configuration is valid', async() => {
 
-    const link = 'https://docs.redis.com/latest/rdi/quickstart/';
+    const link = 'https://redis.io/docs/latest/integrate/redis-data-integration/ingest/data-pipelines/data-pipelines/?utm_source=redisinsight&utm_medium=rdi&utm_campaign=config_file';
     // Verify the link
     await myRedisDatabasePage.setActivePage(RedisOverviewPage.Rdi);
     await rdiInstancesListPage.clickRdiByName(rdiInstance.name);
@@ -123,15 +129,14 @@ test('Verify that link on configuration is valid', async() => {
     await goBackHistory();
 });
 
-test('Verify that user can insert template', async() => {
+test.only('Verify that user can insert template', async() => {
     const disabledAttribute = 'isDisabled';
-    const defaultValue = 'Ingest';
-    const templateWords = 'type: redis';
+    const defaultValue = 'ingest';
+    const templateWords = 'type: mysql';
     // should be empty config
     await myRedisDatabasePage.setActivePage(RedisOverviewPage.Rdi);
     await rdiInstancesListPage.clickRdiByName(rdiInstance.name);
-    await t.click(rdiInstancePage.PipelineManagementPanel.configurationTab);
-    await rdiInstancePage.selectStartPipelineOption(RdiPopoverOptions.File);
+    await rdiInstancePage.selectStartPipelineOption(RdiPopoverOptions.Pipeline);
     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');
@@ -143,12 +148,10 @@ test('Verify that user can insert template', async() => {
     await t.expect(rdiInstancePage.pipelineDropdown.textContent).eql(defaultValue, 'the default value is set incorrectly');
     await rdiInstancePage.setTemplateDropdownValue(RdiTemplatePipelineType.Ingest, RdiTemplateDatabaseType.MySql);
 
-    //verify uniq templates words - should be undated when templates are added
     const enteredText = await rdiInstancePage.MonacoEditor.getTextFromMonaco();
     await t.expect(enteredText).contains(templateWords, 'template is incorrect');
 
     await t.click(rdiInstancePage.templateButton);
     await t.expect(buttonClass).contains(disabledAttribute, 'Apply button is active');
-    await t.expect(rdiInstancePage.pipelineDropdown.textContent).eql('Ingest', 'the value is set incorrectly');
-    await t.expect(rdiInstancePage.databaseDropdown.textContent).eql('MySQL', 'the default value is set incorrectly');
+    await t.expect(rdiInstancePage.pipelineDropdown.textContent).eql(defaultValue, 'the value is set incorrectly');
 });
diff --git a/tests/e2e/tests/web/critical-path/rdi/dry-run-job.e2e.ts b/tests/e2e/tests/web/critical-path/rdi/dry-run-job.e2e.ts
@@ -19,7 +19,7 @@ const outputMock = 'No Redis commands provided by the server.';
 
 const rdiInstance: AddNewRdiParameters = {
     name: 'testInstance',
-    url: 'https://54.175.165.214',
+    url: 'https://11.111.111.111',
     username: 'username',
     password: 'v3rY$tronGPa33w0Rd3ECDb'
 };
