fixes by comments

Author: vlad-dargel

tests/e2e/common-actions/databases-actions.ts

@@ -17,15 +17,34 @@ export class DatabasesActions {
 
     /**
      * Import database using file
-     * @param pathToFile The path to file for import
-     * @param databaseType The database type
+     * @param fileParameters The arguments of imported file
      */
-    async importDatabase(pathToFile: string, databaseType = ''): Promise<void> {
+    async importDatabase(fileParameters: ImportDatabaseParameters): Promise<void> {
         await t
             .click(myRedisDatabasePage.importDatabasesBtn)
-            .setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [pathToFile])
+            .setFilesToUpload(myRedisDatabasePage.importDatabaseInput, [fileParameters.path])
             .click(myRedisDatabasePage.submitImportBtn)
-            .expect(myRedisDatabasePage.successImportMessage.exists).ok(`Successfully added ${databaseType} databases message not displayed`);
+            .expect(myRedisDatabasePage.successImportMessage.exists).ok(`Successfully added ${fileParameters.type} databases message not displayed`);
     }
 
 }
+
+/**
+ * Import database parameters
+ * @param path The path to file
+ * @param type The type of application
+ * @param dbNames The names of databases
+ * @param userName The username of db
+ * @param password The password of db
+ * @param connectionType The connection type of db
+ * @param fileName The file name
+ */
+export type ImportDatabaseParameters = {
+    path: string,
+    type?: string,
+    dbNames?: string[],
+    userName?: string,
+    password?: string,
+    connectionType?: string,
+    fileName?: string
+};

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

@@ -58,7 +58,7 @@ test
         const defaultText = 'Select or drag and drop a file';
 
         // Verify that user can see the “Import Database Connections” tooltip
-        await t.hover(myRedisDatabasePage.importDatabasesBtn);
+        await t.expect(myRedisDatabasePage.importDatabasesBtn.visible).ok('The import databases button not displayed');
         await t.hover(myRedisDatabasePage.importDatabasesBtn);
         await t.expect(browserPage.tooltip.innerText).contains(tooltipText, 'The tooltip message not displayed/correct');
 
@@ -85,9 +85,9 @@ test
 
         // Verify that user can import database with mandatory fields
         await t.click(myRedisDatabasePage.closeDialogBtn);
-        await databasesActions.importDatabase(rdmData.path);
+        await databasesActions.importDatabase(rdmData);
         // Verify that success message is displayed
-        await t.expect(myRedisDatabasePage.successImportMessage.textContent).contains(partialImportedMsg, 'Successfully added databases number not correct');
+        await t.expect(myRedisDatabasePage.successImportMessage.textContent).contains(partialImportedMsg, 'Databases not imported successfully');
 
         // Verify that list of databases is reloaded when database added
         await t.click(myRedisDatabasePage.okDialogBtn);
@@ -105,7 +105,7 @@ test
 
         // Verify that user can import files from Racompass, ARDM, RDM
         for (const db of dbData) {
-            await databasesActions.importDatabase(db.path, db.type);
+            await databasesActions.importDatabase(db);
             await t.click(myRedisDatabasePage.okDialogBtn);
             await databasesActions.verifyDatabasesDisplayed(db.dbNames);
         }