tests for import sertificates

Author: vlad-dargel

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

@@ -1,4 +1,5 @@
 import { t } from 'testcafe';
+import * as fs from 'fs';
 import { MyRedisDatabasePage } from '../pageObjects';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
@@ -26,6 +27,14 @@ export class DatabasesActions {
             .click(myRedisDatabasePage.submitImportBtn)
             .expect(myRedisDatabasePage.importDialogTitle.textContent).eql('Import Results', `Databases from ${fileParameters.type} not imported`);
     }
+
+    /**
+     * Parse json for importing databases
+     * @param path The path to json file
+     */
+    parseDbJsonByPath(path: string): any[] {
+        return JSON.parse(fs.readFileSync(path, 'utf-8'));
+    }
 }
 
 /**
@@ -45,5 +54,6 @@ export type ImportDatabaseParameters = {
     userName?: string,
     password?: string,
     connectionType?: string,
-    fileName?: string
+    fileName?: string,
+    parsedJson?: any
 };

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

@@ -62,7 +62,7 @@ export async function addNewOSSClusterDatabaseApi(databaseParameters: OSSCluster
 export async function discoverSentinelDatabaseApi(databaseParameters: SentinelParameters, primaryGroupsNumber?: number): Promise<void> {
     let masters = databaseParameters.masters;
     if (primaryGroupsNumber) {
-        masters = databaseParameters.masters.slice(0, primaryGroupsNumber);
+        masters = databaseParameters.masters!.slice(0, primaryGroupsNumber);
     }
     const response = await request(endpoint).post('/redis-sentinel/databases')
         .send({
@@ -126,7 +126,7 @@ export async function getDatabaseByConnectionType(connectionType?: string): Prom
 export async function deleteAllDatabasesApi(): Promise<void> {
     const allDatabases = await getAllDatabases();
     if (allDatabases.length > 0) {
-        const databaseIds = [];
+        const databaseIds: string[] = [];
         for (let i = 0; i < allDatabases.length; i++) {
             const dbData = JSON.parse(JSON.stringify(allDatabases[i]));
             databaseIds.push(dbData.id);
@@ -183,8 +183,8 @@ export async function deleteOSSClusterDatabaseApi(databaseParameters: OSSCluster
  * @param databaseParameters The database parameters
  */
 export async function deleteAllSentinelDatabasesApi(databaseParameters: SentinelParameters): Promise<void> {
-    for (let i = 0; i < databaseParameters.name.length; i++) {
-        const databaseId = await getDatabaseByName(databaseParameters.name[i]);
+    for (let i = 0; i < databaseParameters.name!.length; i++) {
+        const databaseId = await getDatabaseByName(databaseParameters.name![i]);
         const response = await request(endpoint).delete('/databases')
             .send({ 'ids': [`${databaseId}`] }).set('Accept', 'application/json');
         await t.expect(response.status).eql(200, 'Delete Sentinel database request failed');

tests/e2e/helpers/database.ts

@@ -158,7 +158,7 @@ export async function acceptLicenseTermsAndAddSentinelDatabaseApi(databaseParame
     // Reload Page to see the database added through api
     await common.reloadPage();
     // Connect to DB
-    await myRedisDatabasePage.clickOnDBByName(databaseParameters.name[1] ?? '');
+    await myRedisDatabasePage.clickOnDBByName(databaseParameters.name![1] ?? '');
 }
 
 /**
@@ -273,7 +273,7 @@ export async function clickOnEditDatabaseByName(databaseName: string): Promise<v
  * Delete database button by name
  * @param databaseName The name of the database
  */
- export async function deleteDatabaseByNameApi(databaseName: string): Promise<void> {
+export async function deleteDatabaseByNameApi(databaseName: string): Promise<void> {
     const databaseId = await getDatabaseByName(databaseName);
     const databaseDeleteBtn = Selector(`[data-testid=delete-instance-${databaseId}-icon]`);
 

tests/e2e/pageObjects/add-redis-database-page.ts

@@ -44,6 +44,7 @@ export class AddRedisDatabasePage {
     primaryGroupNameInput = Selector('[data-testid=primary-group]');
     masterGroupPassword = Selector('[data-testid=sentinel-master-password]');
     connectionType = Selector('[data-testid=connection-type]');
+    sentinelForm = Selector('[data-testid=form]');
     //Links
     buildFromSource = Selector('a').withExactText('Build from source');
     buildFromDocker = Selector('a').withExactText('Docker');

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

@@ -188,24 +188,24 @@ export class MyRedisDatabasePage {
      * Verify database status is visible
     */
     async verifyDatabaseStatusIsVisible(): Promise<void> {
-        await t.expect(Selector("div").withAttribute("data-testid", /database-status-new-*/).visible)
-            .ok("Database status is not visible");
+        await t.expect(Selector('div').withAttribute('data-testid', /database-status-new-*/).visible)
+            .ok('Database status is not visible');
     }
 
     /**
     * Verify database status is not visible
     */
     async verifyDatabaseStatusIsNotVisible(): Promise<void> {
-        await t.expect(Selector("div").withAttribute("data-testid", /database-status-new-*/).visible)
-            .notOk("Database status is still visible");
+        await t.expect(Selector('div').withAttribute('data-testid', /database-status-new-*/).visible)
+            .notOk('Database status is still visible');
     }
 
     /**
     * Filter array with database objects by result field and return names
      * @param listOfDb Actual databases list
      * @param result The expected import result
     */
-    filterDatabaseListByResult(listOfDb: DatabasesForImport, result: string) {
+    getDatabaseNamesFromListByResult(listOfDb: DatabasesForImport, result: string): string[] {
         return listOfDb.filter(element => element.result === result).map(item => item.name!);
     }
 }

tests/e2e/test-data/certs/certsByPath/caPath.crt

@@ -0,0 +1,3 @@
+-----BEGIN CERTIFICATE-----
+mockedCACertificatePath
+-----END CERTIFICATE-----

tests/e2e/test-data/certs/certsByPath/caSameBody.crt

@@ -0,0 +1,3 @@
+-----BEGIN CERTIFICATE-----
+mockedCACertificatePath
+-----END CERTIFICATE-----

tests/e2e/test-data/certs/certsByPath/clientPath.crt

@@ -0,0 +1,3 @@
+-----BEGIN CERTIFICATE-----
+mockedClientCrtPath
+-----END CERTIFICATE-----

tests/e2e/test-data/certs/certsByPath/clientPath.key

@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+mockedPrivateKeyPath
+-----END PRIVATE KEY-----

tests/e2e/test-data/certs/certsByPath/clientSameBody.crt

@@ -0,0 +1,3 @@
+-----BEGIN CERTIFICATE-----
+mockedClientCrtPath
+-----END CERTIFICATE-----