add test for remove certificates

Author: mariasergeenko

tests/e2e/helpers/constants.ts

@@ -121,3 +121,8 @@ export enum RdiPopoverOptions  {
     Pipeline = 'empty',
 }
 
+export enum TlsCertificates  {
+    CA  = 'ca',
+    Client = 'client',
+}
+

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

@@ -1,4 +1,5 @@
-import { t, Selector } from 'testcafe';
+import { Selector, t } from 'testcafe';
+import { TlsCertificates } from '../../../helpers/constants';
 
 export class AddRedisDatabase {
     //-------------------------------------------------------------------------------------------
@@ -29,6 +30,7 @@ export class AddRedisDatabase {
     cancelButton = Selector('[data-testid=btn-cancel]');
     showPasswordBtn = Selector('[aria-label^="Show password"]');
     testConnectionBtn = Selector('[data-testid=btn-test-connection]');
+
     // TEXT INPUTS (also referred to as 'Text fields')
     disabledDatabaseInfo = Selector('[class=euiListGroupItem__label]');
     hostInput = Selector('[data-testid=host]');
@@ -57,9 +59,12 @@ export class AddRedisDatabase {
     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]');
     // RADIO BUTTONS
     sshPasswordRadioBtn = Selector('#password~div', { timeout: 500 });
     sshPrivateKeyRadioBtn = Selector('#privateKey~div', { timeout: 500 });
@@ -253,6 +258,29 @@ export class AddRedisDatabase {
         await t.click(this.selectCompressor);
         await t.click(Selector(`[id="${compressor}"]`));
     }
+
+    /**
+     * Remove certificate
+     * @param certificate - certificate
+     * @param name - name of the certificate
+     */
+    async removeCertificateButton(certificate: TlsCertificates, name: string): Promise<void> {
+
+        const row =  Selector('button')
+            .find('div')
+            .withText(name);
+        const removeButton = `[data-testid^=delete-${certificate}-cert]`;
+        const removeButtonFooter = Selector('[class^=_popoverFooter]');
+
+        if(certificate === TlsCertificates.CA){
+            await t.click(this.caCertField);
+        }
+        else {
+            await t.click(this.clientCertField);
+        }
+        await t.click(row.find(removeButton));
+        await t.click(removeButtonFooter.find(removeButton));
+    }
 }
 
 /**

tests/e2e/tests/web/regression/database-overview/database-tls-certificates.e2e.ts

@@ -0,0 +1,52 @@
+import { rte, TlsCertificates } from '../../../../helpers/constants';
+import { BrowserPage, MyRedisDatabasePage } from '../../../../pageObjects';
+import { commonUrl, ossStandaloneConfig, ossStandaloneTlsConfig } from '../../../../helpers/conf';
+import { DatabaseHelper } from '../../../../helpers';
+import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
+
+const browserPage = new BrowserPage();
+const myRedisDatabasePage = new MyRedisDatabasePage();
+const databaseHelper = new DatabaseHelper();
+const databaseAPIRequests = new DatabaseAPIRequests();
+
+fixture `tls certificates`
+    .meta({ type: 'regression', rte: rte.none })
+    .page(commonUrl)
+    .beforeEach(async() => {
+        await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneConfig);
+        await myRedisDatabasePage.reloadPage();
+        await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneTlsConfig);
+
+    })
+    .afterEach(async() => {
+        // Delete database
+        await databaseHelper.deleteDatabase(ossStandaloneTlsConfig.databaseName);
+        await databaseHelper.deleteDatabase(ossStandaloneConfig.databaseName);
+    });
+test('Verify that user can remove added certificates', async t => {
+    await t.click(browserPage.NavigationPanel.myRedisDBButton);
+    await myRedisDatabasePage.clickOnEditDBByName(ossStandaloneTlsConfig.databaseName);
+    await myRedisDatabasePage.AddRedisDatabase.removeCertificateButton(TlsCertificates.CA, 'ca');
+    await myRedisDatabasePage.reloadPage();
+    // wait for dbs are displayed
+    await t.expect(myRedisDatabasePage.dbNameList.count).gt(0);
+    await myRedisDatabasePage.clickOnEditDBByName(ossStandaloneTlsConfig.databaseName);
+    //verify that ca certificate is deleted
+    await t.expect(myRedisDatabasePage.AddRedisDatabase.caCertField.textContent).contains('No CA Certificate', 'CA certificate was not deleted');
+    await t.click(myRedisDatabasePage.AddRedisDatabase.caCertField);
+    await t.expect(myRedisDatabasePage.AddRedisDatabase.certificateDropdownList.textContent).contains('ca', 'CA certificate was not deleted');
+
+    //verify that client certificate is deleted
+    await myRedisDatabasePage.AddRedisDatabase.removeCertificateButton(TlsCertificates.Client, 'client');
+    await myRedisDatabasePage.reloadPage();
+    // wait for dbs are displayed
+    await t.expect(myRedisDatabasePage.dbNameList.count).gt(0);
+    await myRedisDatabasePage.clickOnEditDBByName(ossStandaloneTlsConfig.databaseName);
+    await t.expect(myRedisDatabasePage.AddRedisDatabase.requiresTlsClientCheckbox.checked).notOk('the certificate was not removed');
+
+    await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName!);
+
+    await t.click(browserPage.NavigationPanel.myRedisDBButton);
+    await myRedisDatabasePage.clickOnDBByName(ossStandaloneTlsConfig.databaseName);
+    await t.expect(browserPage.Toast.toastError.textContent).contains('CA or Client certificate', 'user can connect to db without certificates');
+});