fix #7

Author: mariasergeenko

tests/e2e/helpers/api/api-database.ts

@@ -204,7 +204,6 @@ export class DatabaseAPIRequests {
     async deleteAllDatabasesApi(): Promise<void> {
         const allDatabases = await this.getAllDatabases();
         console.log(`common db count is "${allDatabases}"`);
-        let counter = 0;
         if (allDatabases.length > 0) {
             const databaseIds: string[] = [];
             for (let i = 0; i < allDatabases.length; i++) {
@@ -217,12 +216,10 @@ export class DatabaseAPIRequests {
                     ResourcePath.Databases,
                     requestBody
                 );
-                ++counter;
                 await t.expect(await response.status).eql(200);
             }
             await this.deleteAllDatabasesByConnectionTypeApi('SENTINEL');
         }
-        console.log(`common deleted db count is "${counter}"`);
     }
 
     /**

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

@@ -59,7 +59,7 @@ export class MyRedisDatabasePage extends BasePage {
     //TEXT ELEMENTS
     moduleTooltip = Selector('.euiToolTipPopover');
     moduleQuantifier = Selector('[data-testid=_module]');
-    dbNameList = Selector('[data-testid^=instance-name] span', { timeout: 3000 });
+    dbNameList = Selector('[data-testid^=instance-name]', { timeout: 3000 });
     tableRowContent = Selector('[data-test-subj=database-alias-column]');
     hostPort = Selector('[data-testid=host-port]');
     noResultsFoundMessage = Selector('div').withExactText('No results found');

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

@@ -38,10 +38,7 @@ 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');
+        await databaseAPIRequests.deleteAllDatabasesApi();
         // await databaseAPIRequests.deleteOSSClusterDatabaseApi(ossClusterConfig);
         // Delete exported file
     })('Exporting Standalone, OSS Cluster, and Sentinel connection types', async t => {
@@ -72,10 +69,7 @@ test
         await t.expect(foundExportedFiles.length).gt(0, 'The Exported file not saved');
 
         // Delete databases
-        await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
-        await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneTlsConfig);
-        await databaseAPIRequests.deleteOSSClusterDatabaseApi(ossClusterConfig);
-        await databaseAPIRequests.deleteAllDatabasesByConnectionTypeApi('SENTINEL');
+        await databaseAPIRequests.deleteAllDatabasesApi();
         await myRedisDatabasePage.reloadPage();
 
         const exportedData = {
@@ -91,7 +85,7 @@ test
         // Verify that user can import exported file with all datatypes and certificates
         await databasesActions.verifyDatabasesDisplayed(exportedData.dbImportedNames);
 
-        const modulesDbRedisStackIcon = myRedisDatabasePage.dbNameList.withExactText(ossStandaloneConfig.databaseName).parent('tr')
+        const modulesDbRedisStackIcon = myRedisDatabasePage.dbNameList.child('span').withExactText(ossStandaloneConfig.databaseName).parent('tr')
             .find(myRedisDatabasePage.cssRedisStackIcon);
         // Verify that db has redis stack icon
         await t.expect(modulesDbRedisStackIcon.exists).ok('module icon is displayed');