Merge pull request #957 from rocket-admin/unit-tests

fix existing and initial tests

Author: lyubov-voloshko

frontend/src/app/components/audit/audit.component.spec.ts

@@ -12,6 +12,7 @@ import { UsersService } from 'src/app/services/users.service';
 import { of } from 'rxjs';
 import { LogAction, LogStatus } from 'src/app/models/logs';
 import { InfoDialogComponent } from './info-dialog/info-dialog.component';
+import { Angulartics2Module } from 'angulartics2';
 
 describe('AuditComponent', () => {
   let component: AuditComponent;
@@ -77,7 +78,8 @@ describe('AuditComponent', () => {
         MatSnackBarModule,
         MatDialogModule,
         MatPaginatorModule,
-        BrowserAnimationsModule
+        BrowserAnimationsModule,
+        Angulartics2Module.forRoot()
       ],
       declarations: [ AuditComponent ]
     })

frontend/src/app/components/company/company.component.spec.ts

@@ -222,13 +222,12 @@ describe('CompanyComponent', () => {
 
   it('should open Add member dialog and pass company id and name', () => {
     const fakeAddMemberDialogOpen = spyOn(dialog, 'open');
-    component.company.id = 'company-12345678';
-    component.company.name = 'My company';
+    component.company = mockCompany;
 
     component.handleAddMemberDialogOpen();
     expect(fakeAddMemberDialogOpen).toHaveBeenCalledOnceWith(InviteMemberDialogComponent, {
       width: '25em',
-      data: {id: 'company-12345678', name: 'My company'}
+      data: mockCompany
     });
   });
 

frontend/src/app/components/company/invite-member-dialog/invite-member-dialog.component.spec.ts

@@ -21,7 +21,7 @@ describe('AddMemberDialogComponent', () => {
         Angulartics2Module.forRoot()
       ],
       providers: [
-        { provide: MAT_DIALOG_DATA, useValue: { id: '' } },
+        { provide: MAT_DIALOG_DATA, useValue: { id: '', connections: [] } },
         { provide: MatDialogRef, useValue: MatDialogRef }
       ],
     })

frontend/src/app/components/connect-db/connect-db.component.spec.ts

@@ -24,7 +24,6 @@ describe('ConnectDBComponent', () => {
   let component: ConnectDBComponent;
   let fixture: ComponentFixture<ConnectDBComponent>;
   let dialog: MatDialog;
-  let mockLocalStorage;
 
   let fakeNotifications = jasmine.createSpyObj('NotificationsService', ['showErrorSnackbar', 'showSuccessSnackbar', 'showAlert', 'dismissAlert']);
   let fakeConnectionsService = jasmine.createSpyObj('ConnectionsService', [
@@ -87,26 +86,10 @@ describe('ConnectDBComponent', () => {
     component = fixture.componentInstance;
     dialog = TestBed.get(MatDialog);
 
-    let store = {};
-    mockLocalStorage = {
-      getItem: (key: string): string => {
-        return key in store ? store[key] : null;
-      },
-      setItem: (key: string, value: string) => {
-        store[key] = `${value}`;
-      },
-      removeItem: (key: string) => {
-        delete store[key];
-      },
-      clear: () => {
-        store = {};
-      }
-    };
-
-      // @ts-ignore
-      global.window.fbq = jasmine.createSpy();
-      // @ts-ignore
-      global.window.Intercom = jasmine.createSpy();
+    // @ts-ignore
+    global.window.fbq = jasmine.createSpy();
+    // @ts-ignore
+    global.window.Intercom = jasmine.createSpy();
 
     fakeConnectionsService.currentConnection.and.returnValue(connectionCredsApp);
     fakeConnectionsService.getCurrentConnectionTitle.and.returnValue(of('Test connection via SSH tunnel to mySQL'));
@@ -159,8 +142,8 @@ describe('ConnectDBComponent', () => {
     fakeNotifications.showSuccessSnackbar.calls.reset();
   });
 
-  it('should generate password', () => {
-    component.generatePassword();
+  it('should generate password if toggle is enabled', () => {
+    component.generatePassword(true);
     expect(component.masterKey).toBeDefined();
   });
 
@@ -175,29 +158,6 @@ describe('ConnectDBComponent', () => {
     });
   });
 
-  it('should write master key in localstorage if masterEncryption is turned on', () => {
-    spyOn(localStorage, 'setItem').and.callFake(mockLocalStorage.setItem);
-
-    component.db.masterEncryption = true;
-    component.masterKey = 'abcd-0987654321';
-    component.connectionID = '12345678';
-
-    component.checkMasterPassword();
-
-    expect(localStorage.setItem).toHaveBeenCalledOnceWith('12345678__masterKey', 'abcd-0987654321');
-  })
-
-  it('should remove master key in localstorage if masterEncryption is turned off', () => {
-    spyOn(localStorage, 'removeItem').and.callFake(mockLocalStorage.removeItem);
-
-    component.db.masterEncryption = false;
-    component.connectionID = '12345678';
-
-    component.checkMasterPassword();
-
-    expect(localStorage.removeItem).toHaveBeenCalledOnceWith('12345678__masterKey');
-  })
-
   it('should create direct connection', () => {
     fakeConnectionsService.createConnection.and.returnValue(of(connectionCredsApp));
     spyOnProperty(component, "db", "get").and.returnValue(connectionCredsApp);
@@ -268,12 +228,14 @@ describe('ConnectDBComponent', () => {
   it('should open dialog on test error', () => {
     const fakeDialogOpen = spyOn(dialog, 'open');
     spyOnProperty(component, "db", "get").and.returnValue(connectionCredsApp);
+    component.masterKey = "master_password_12345678"
     component.handleConnectionError('Hostname is invalid');
 
     expect(fakeDialogOpen).toHaveBeenCalledOnceWith(DbConnectionConfirmDialogComponent, {
       width: '25em',
       data: {
         dbCreds: connectionCredsApp,
+        masterKey: 'master_password_12345678',
         errorMessage: 'Hostname is invalid'
       }
     });

frontend/src/app/components/connect-db/db-connection-confirm-dialog/db-connection-confirm-dialog.component.ts

@@ -2,7 +2,6 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { Router } from '@angular/router';
 import { ConnectionsService } from 'src/app/services/connections.service';
-import { NotificationsService } from 'src/app/services/notifications.service';
 import { DbConnectionDeleteDialogComponent } from '../db-connection-delete-dialog/db-connection-delete-dialog.component';
 import { environment } from 'src/environments/environment';
 
@@ -21,7 +20,6 @@ export class DbConnectionConfirmDialogComponent implements OnInit {
     private _connections: ConnectionsService,
     public dialogRef: MatDialogRef<DbConnectionDeleteDialogComponent>,
     public router: Router,
-    private _notifications: NotificationsService
   ) { }
 
   ngOnInit(): void {}

frontend/src/app/components/connect-db/db-credentials-forms/base-credentials-form/base-credentials-form.component.spec.ts

@@ -11,7 +11,7 @@ describe('BaseCredentialsFormComponent', () => {
       imports: [BaseCredentialsFormComponent]
     })
     .compileComponents();
-    
+
     fixture = TestBed.createComponent(BaseCredentialsFormComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();

frontend/src/app/components/connect-db/db-credentials-forms/base-credentials-form/base-credentials-form.component.ts

@@ -13,20 +13,14 @@ export class BaseCredentialsFormComponent {
   @Input() readonly: boolean;
   @Input() submitting: boolean;
   @Input() masterKey: string;
-  // @Input() isMasterKeyTurnedOn: boolean;
   @Input() accessLevel: string;
 
   @Output() switchToAgent = new EventEmitter<void>();
   @Output() masterKeyChange = new EventEmitter<string>();
-  // @Output() masterKeyToggle = new EventEmitter<boolean>();
 
   public ngrokLink = "https://help.rocketadmin.com/en/articles/8556731-how-to-connect-a-local-database-via-ngrok";
 
   handleMasterKeyChange(newMasterKey: string): void {
     this.masterKeyChange.emit(newMasterKey);
   }
-
-  // handleMasterKeyToggle(isTurnedOn: boolean): void {
-  //   this.masterKeyToggle.emit(isTurnedOn);
-  // }
 }

frontend/src/app/components/connect-db/db-credentials-forms/dynamodb-credentials-form/dynamodb-credentials-form.component.spec.ts

@@ -1,19 +1,28 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DynamodbCredentialsFormComponent } from './dynamodb-credentials-form.component';
+import { FormsModule } from '@angular/forms';
 
 describe('DynamodbCredentialsFormComponent', () => {
   let component: DynamodbCredentialsFormComponent;
   let fixture: ComponentFixture<DynamodbCredentialsFormComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [DynamodbCredentialsFormComponent]
+      declarations: [DynamodbCredentialsFormComponent],
+      imports: [
+        FormsModule
+      ]
     })
     .compileComponents();
-    
+
     fixture = TestBed.createComponent(DynamodbCredentialsFormComponent);
     component = fixture.componentInstance;
+
+    component.connection = {
+      id: "12345678"
+    } as any;
+
     fixture.detectChanges();
   });
 

frontend/src/app/components/connect-db/db-credentials-forms/mongodb-credentials-form/mongodb-credentials-form.component.spec.ts

@@ -1,19 +1,52 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { MongodbCredentialsFormComponent } from './mongodb-credentials-form.component';
+import { FormsModule } from '@angular/forms';
+import { ConnectionType, DBtype } from 'src/app/models/connection';
+import { MatCheckboxModule } from '@angular/material/checkbox';
 
 describe('MongodbCredentialsFormComponent', () => {
   let component: MongodbCredentialsFormComponent;
   let fixture: ComponentFixture<MongodbCredentialsFormComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [MongodbCredentialsFormComponent]
+      declarations: [MongodbCredentialsFormComponent],
+      imports: [
+        FormsModule,
+        MatCheckboxModule
+      ]
     })
     .compileComponents();
-    
+
     fixture = TestBed.createComponent(MongodbCredentialsFormComponent);
     component = fixture.componentInstance;
+
+    component.connection = {
+      id: "12345678"
+    } as any;
+
+    // component.connection = {
+    //   "title": "Test connection via SSH tunnel to mySQL",
+    //   "masterEncryption": false,
+    //   "type": DBtype.MySQL,
+    //   "host": "database-2.cvfuxe8nltiq.us-east-2.rds.amazonaws.com",
+    //   "port": "3306",
+    //   "username": "admin",
+    //   "database": "testDB",
+    //   "schema": null,
+    //   "sid": null,
+    //   "id": "9d5f6d0f-9516-4598-91c4-e4fe6330b4d4",
+    //   "ssh": true,
+    //   "sshHost": "3.134.99.192",
+    //   "sshPort": '22',
+    //   "sshUsername": "ubuntu",
+    //   "ssl": false,
+    //   "cert": null,
+    //   "connectionType": ConnectionType.Direct,
+    //   "azure_encryption": false,
+    //   "signing_key": ''
+    // };
     fixture.detectChanges();
   });
 

frontend/src/app/components/connect-db/db-credentials-forms/mssql-credentials-form/mssql-credentials-form.component.spec.ts

@@ -1,19 +1,30 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { MssqlCredentialsFormComponent } from './mssql-credentials-form.component';
+import { FormsModule } from '@angular/forms';
+import { MatCheckboxModule } from '@angular/material/checkbox';
 
 describe('MssqlCredentialsFormComponent', () => {
   let component: MssqlCredentialsFormComponent;
   let fixture: ComponentFixture<MssqlCredentialsFormComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [MssqlCredentialsFormComponent]
+      declarations: [MssqlCredentialsFormComponent],
+      imports: [
+        FormsModule,
+        MatCheckboxModule
+      ]
     })
     .compileComponents();
-    
+
     fixture = TestBed.createComponent(MssqlCredentialsFormComponent);
     component = fixture.componentInstance;
+
+    component.connection = {
+      id: "12345678"
+    } as any;
+
     fixture.detectChanges();
   });