fix for regression tests#2

Author: mariasergeenko

tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts

@@ -72,6 +72,8 @@ export class AddRedisDatabaseDialog {
     aiChatMessage = Selector('[data-testid=ai-chat-message-btn]');
     aiCloseMessage = Selector('[aria-label="Closes this modal window"]');
 
+    getDeleteCertificate = (certificate: TlsCertificates) => Selector(`[data-testid^=delete-${certificate}-cert]`);
+
     /**
      * Adding a new redis database
      * @param parameters the parameters of the database
@@ -266,7 +268,7 @@ export class AddRedisDatabaseDialog {
         const row =  Selector('button')
             .find('div')
             .withText(name);
-        const removeButton = `[data-testid^=delete-${certificate}-cert]`;
+        const removeButton = String(this.getDeleteCertificate(certificate));
         const removeButtonFooter = Selector('[class^=_popoverFooter]');
 
         if(certificate === TlsCertificates.CA){

tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts

@@ -192,6 +192,7 @@ test
         };
         // Verify that user can add SSH tunnel with Password for OSS Cluster database
         await myRedisDatabasePage.AddRedisDatabaseDialog.addStandaloneSSHDatabase(sshDbClusterPass, sshWithPass);
+        // should be deleted after https://redislabs.atlassian.net/browse/RI-5995
         await t.wait(6000)
         await myRedisDatabasePage.clickOnDBByName(sshDbClusterPass.databaseName);
         await Common.checkURLContainsText('browser');

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

@@ -49,7 +49,7 @@ test('Verify that user can set overview refresh', async t => {
     const common_command = 'info';
 
     await t.click(browserPage.OverviewPanel.autoRefreshArrow);
-    await t.expect(browserPage.OverviewPanel.autoRefreshRateInput.textContent).eql('5000 s', 'default value is incorrect');
+    await t.expect(browserPage.OverviewPanel.autoRefreshRateInput.textContent).eql('5 s', 'default value is incorrect');
     await t.click(browserPage.OverviewPanel.autoRefreshCheckbox);
     //Start Monitor
     await browserPage.Profiler.startMonitor();

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

@@ -27,6 +27,10 @@ test('Verify that user can remove added certificates', async t => {
     await t.click(browserPage.NavigationPanel.myRedisDBButton);
     await myRedisDatabasePage.clickOnEditDBByName(ossStandaloneTlsConfig.databaseName);
     await myRedisDatabasePage.AddRedisDatabaseDialog.removeCertificateButton(TlsCertificates.CA, 'ca');
+    // remove if other Certificates were added
+    if( await myRedisDatabasePage.AddRedisDatabaseDialog.getDeleteCertificate(TlsCertificates.CA).exists){
+        await myRedisDatabasePage.AddRedisDatabaseDialog.removeCertificateButton(TlsCertificates.CA, 'ca');
+    }
     await myRedisDatabasePage.reloadPage();
     // wait for dbs are displayed
     await t.expect(myRedisDatabasePage.dbNameList.count).gt(0);