Merge pull request #2453 from RedisInsight/e2e/feature/RI-4617-sign-in-users/compressor

add api key adding

Author: mariasergeenko

redisinsight/ui/src/pages/home/components/HomeHeader/HomeHeader.spec.tsx

@@ -31,7 +31,7 @@ describe('HomeHeader', () => {
   it('should open import dbs dialog', () => {
     render(<HomeHeader {...instance(mockedProps)} />)
 
-    fireEvent.click(screen.getByTestId('import-dbs-btn'))
+    fireEvent.click(screen.getByTestId('import-from-file-btn'))
 
     expect(screen.getByTestId('import-dbs-dialog')).toBeInTheDocument()
   })
@@ -42,7 +42,7 @@ describe('HomeHeader', () => {
 
     render(<HomeHeader {...instance(mockedProps)} />)
 
-    fireEvent.click(screen.getByTestId('import-dbs-btn'))
+    fireEvent.click(screen.getByTestId('import-from-file-btn'))
 
     expect(sendEventTelemetry).toBeCalledWith({
       event: TelemetryEvent.CONFIG_DATABASES_REDIS_IMPORT_CLICKED

redisinsight/ui/src/pages/home/components/HomeHeader/HomeHeader.tsx

@@ -144,7 +144,7 @@ const HomeHeader = ({ onAddInstance, direction }: Props) => {
         onClick={handleClickImportDbBtn}
         className={styles.importDatabasesBtn}
         size="m"
-        data-testid="import-dbs-btn"
+        data-testid="import-from-file-btn"
       >
         <EuiIcon type="importAction" />
       </EuiButton>

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

@@ -57,11 +57,15 @@ export class AddRedisDatabase {
     // DROPDOWNS
     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 });
     // CHECKBOXES
     useSSHCheckbox = Selector('[data-testid=use-ssh]~div', { timeout: 500 });
+    dataCompressorCheckbox = Selector('[data-testid=showCompressor] ~ label');
     // RADIO BUTTONS
     sshPasswordRadioBtn = Selector('#password~div', { timeout: 500 });
     sshPrivateKeyRadioBtn = Selector('#privateKey~div', { timeout: 500 });
+    // LABELS
+    dataCompressorLabel = Selector('[data-testid=showCompressor] ~ label', { timeout: 1000 });
 
     /**
      * Adding a new redis database
@@ -256,6 +260,20 @@ export class AddRedisDatabase {
             await t.typeText(this.databaseAliasInput, parameters.ossClusterDatabaseName, { replace: true, paste: true });
         }
     }
+
+    /**
+     * set copressor value in dropdown
+     * @param compressor - compressor value
+     * @param value - checkbox value
+     */
+    async setCompressorValue(compressor: string){
+
+        if(!await this.selectCompressor.exists) {
+            await t.click(this.dataCompressorLabel);
+        }
+        await t.click(this.selectCompressor);
+        await t.click(Selector(`[id="${compressor}"]`));
+    }
 }
 
 /**

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

@@ -31,7 +31,7 @@ export class MyRedisDatabasePage extends BasePage {
     sortByHostAndPort = Selector('span').withAttribute('title', 'Host:Port');
     sortByConnectionType = Selector('span').withAttribute('title', 'Connection Type');
     sortByLastConnection = Selector('span').withAttribute('title', 'Last connection');
-    importDatabasesBtn = Selector('[data-testid=import-dbs-btn]');
+    importDatabasesBtn = Selector('[data-testid=import-from-file-btn]');
     submitImportBtn = Selector('[data-testid=submit-btn]');
     closeDialogBtn = Selector('[aria-label="Closes this modal window"]');
     okDialogBtn = Selector('[data-testid=ok-btn]');

tests/e2e/test-data/import-databases/rdm-full.json

@@ -189,6 +189,13 @@
 		"db": "dsad",
         "result": "failed"
     },
+  {
+    "compressor": "Invalid",
+    "host": "localhost",
+    "port": 8102,
+    "name": "rdmCompressorInvalid",
+    "result": "partial"
+  },
 	{
         "host": "localhost",
         "port": 8102,

tests/e2e/tests/critical-path/database/export-databases.e2e.ts

@@ -28,6 +28,7 @@ fixture `Export databases`
 test
     .before(async() => {
         await databaseHelper.acceptLicenseTerms();
+        await databaseAPIRequests.deleteAllDatabasesApi();
         await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneConfig);
         await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneTlsConfig);
         await databaseAPIRequests.addNewOSSClusterDatabaseApi(ossClusterConfig);
@@ -36,12 +37,12 @@ test
     })
     .after(async() => {
         // Delete all databases
+        fs.unlinkSync(joinPath(fileDownloadPath, foundExportedFiles[0]));
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneTlsConfig);
         await databaseAPIRequests.deleteOSSClusterDatabaseApi(ossClusterConfig);
         await databaseAPIRequests.deleteAllDatabasesByConnectionTypeApi('SENTINEL');
         // Delete exported file
-        fs.unlinkSync(joinPath(fileDownloadPath, foundExportedFiles[0]));
     })('Exporting Standalone, OSS Cluster, and Sentinel connection types', async t => {
         const databaseNames = [
             ossStandaloneConfig.databaseName,
@@ -50,6 +51,12 @@ test
             ossSentinelConfig.masters[1].alias
         ];
 
+        const compressor = 'Brotli';
+
+        await databaseHelper.clickOnEditDatabaseByName(ossStandaloneConfig.databaseName);
+        await myRedisDatabasePage.AddRedisDatabase.setCompressorValue(compressor);
+        await t.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton);
+
         // Select databases checkboxes
         await databasesActions.selectDatabasesByNames(databaseNames);
         // Export connections with passwords
@@ -72,7 +79,7 @@ test
 
         const exportedData = {
             path: joinPath(fileDownloadPath, foundExportedFiles[0]),
-            successNumber: 4,
+            successNumber: databaseNames.length,
             dbImportedNames: databaseNames
         };
 
@@ -82,9 +89,15 @@ test
         await t.click(myRedisDatabasePage.okDialogBtn);
         // Verify that user can import exported file with all datatypes and certificates
         await databasesActions.verifyDatabasesDisplayed(exportedData.dbImportedNames);
+
         await databaseHelper.clickOnEditDatabaseByName(databaseNames[1]);
         await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).contains('ca', 'CA certificate import incorrect');
         await t.expect(myRedisDatabasePage.AddRedisDatabase.clientCertField.textContent).contains('client', 'Client certificate import incorrect');
+        await t.click(myRedisDatabasePage.AddRedisDatabase.cancelButton);
+
+        await databaseHelper.clickOnEditDatabaseByName(ossStandaloneConfig.databaseName);
+        await t.expect(myRedisDatabasePage.AddRedisDatabase.selectCompressor.textContent).eql(compressor, 'Compressor import incorrect');
+
     });
 test
     .before(async() => {