fix tests

Author: gugu

frontend/buildspec.yml

@@ -35,12 +35,12 @@ describe('AuditLogDialogComponent', () => {
     success: true,
   };
 
-  const mockAuditLogResponse: AuditLogResponse = {
+  const createMockAuditLogResponse = (): AuditLogResponse => ({
     data: [mockAuditLogEntry],
     pagination: { total: 1, currentPage: 1, perPage: 20, lastPage: 1 },
-  };
+  });
 
-  const mockMultipleLogsResponse: AuditLogResponse = {
+  const createMockMultipleLogsResponse = (): AuditLogResponse => ({
     data: [
       mockAuditLogEntry,
       {
@@ -74,11 +74,11 @@ describe('AuditLogDialogComponent', () => {
       },
     ],
     pagination: { total: 5, currentPage: 1, perPage: 20, lastPage: 1 },
-  };
+  });
 
   beforeEach(async () => {
     mockSecretsService = jasmine.createSpyObj('SecretsService', ['getAuditLog']);
-    mockSecretsService.getAuditLog.and.returnValue(of(mockAuditLogResponse));
+    mockSecretsService.getAuditLog.and.callFake(() => of(createMockAuditLogResponse()));
 
     mockDialogRef = jasmine.createSpyObj('MatDialogRef', ['close']);
 
@@ -204,23 +204,23 @@ describe('AuditLogDialogComponent', () => {
   describe('loadAuditLog', () => {
     it('should set loading to true while fetching', () => {
       component.loading = false;
-      mockSecretsService.getAuditLog.and.returnValue(of(mockAuditLogResponse));
+      mockSecretsService.getAuditLog.and.callFake(() => of(createMockAuditLogResponse()));
 
       component.loadAuditLog();
 
       expect(component.loading).toBeFalse();
     });
 
     it('should update logs on successful fetch', () => {
-      mockSecretsService.getAuditLog.and.returnValue(of(mockMultipleLogsResponse));
+      mockSecretsService.getAuditLog.and.callFake(() => of(createMockMultipleLogsResponse()));
 
       component.loadAuditLog();
 
       expect(component.logs.length).toBe(5);
     });
 
     it('should update pagination on successful fetch', () => {
-      mockSecretsService.getAuditLog.and.returnValue(of(mockMultipleLogsResponse));
+      mockSecretsService.getAuditLog.and.callFake(() => of(createMockMultipleLogsResponse()));
 
       component.loadAuditLog();
 
@@ -246,6 +246,11 @@ describe('AuditLogDialogComponent', () => {
         length: 100
       };
 
+      // Update mock to return pagination matching the page change
+      mockSecretsService.getAuditLog.and.callFake(() => of({
+        data: [mockAuditLogEntry],
+        pagination: { total: 100, currentPage: 3, perPage: 50, lastPage: 2 }
+      }));
       mockSecretsService.getAuditLog.calls.reset();
       component.onPageChange(pageEvent);
 
@@ -270,7 +275,7 @@ describe('AuditLogDialogComponent', () => {
 
   describe('with multiple audit log entries', () => {
     beforeEach(() => {
-      mockSecretsService.getAuditLog.and.returnValue(of(mockMultipleLogsResponse));
+      mockSecretsService.getAuditLog.and.callFake(() => of(createMockMultipleLogsResponse()));
       component.loadAuditLog();
     });
 

frontend/src/app/components/secrets/audit-log-dialog/audit-log-dialog.component.spec.ts

@@ -34,18 +34,18 @@ describe('SecretsComponent', () => {
     masterEncryption: false,
   };
 
-  const mockSecretsResponse = {
+  const createMockSecretsResponse = () => ({
     data: [mockSecret],
     pagination: { total: 1, currentPage: 1, perPage: 20, lastPage: 1 }
-  };
+  });
 
   beforeEach(async () => {
     secretsUpdatedSubject = new BehaviorSubject<string>('');
 
     mockSecretsService = jasmine.createSpyObj('SecretsService', ['fetchSecrets'], {
       cast: secretsUpdatedSubject.asObservable()
     });
-    mockSecretsService.fetchSecrets.and.returnValue(of(mockSecretsResponse));
+    mockSecretsService.fetchSecrets.and.callFake(() => of(createMockSecretsResponse()));
 
     mockCompanyService = jasmine.createSpyObj('CompanyService', ['getCurrentTabTitle']);
     mockCompanyService.getCurrentTabTitle.and.returnValue(of('Test Company'));
@@ -215,6 +215,11 @@ describe('SecretsComponent', () => {
         length: 100
       };
 
+      // Update mock to return pagination matching the page change
+      mockSecretsService.fetchSecrets.and.callFake(() => of({
+        data: [mockSecret],
+        pagination: { total: 100, currentPage: 2, perPage: 10, lastPage: 10 }
+      }));
       mockSecretsService.fetchSecrets.calls.reset();
       component.onPageChange(pageEvent);
 
@@ -269,7 +274,7 @@ describe('SecretsComponent', () => {
   describe('loadSecrets', () => {
     it('should set loading to true while fetching', () => {
       component.loading = false;
-      mockSecretsService.fetchSecrets.and.returnValue(of(mockSecretsResponse));
+      mockSecretsService.fetchSecrets.and.callFake(() => of(createMockSecretsResponse()));
 
       component.loadSecrets();