fix(mixin): refactor test cases related to pr 108 (#109)

refactor test cases related to pr 108 gh-107
sourcefuse · Apr 3, 2024 · 0bdef84 · 0bdef84
1 parent 2aad7e0
commit 0bdef84
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/src/__tests__/acceptance/audit.mixin.acceptance.ts b/src/__tests__/acceptance/audit.mixin.acceptance.ts
@@ -1,6 +1,6 @@
 import {expect, sinon} from '@loopback/testlab';
 import {v4 as uuidv4} from 'uuid';
-import {Action, User} from '../..';
+import {Action} from '../..';
 import {TestAuditDataSource} from './fixtures/datasources/audit.datasource';
 import {TestDataSource} from './fixtures/datasources/test.datasource';
 import {TestModel} from './fixtures/models/test.model';
@@ -10,24 +10,13 @@ import {
   testAuditOpts,
   TestRepository,
 } from './fixtures/repositories/test.repository';
+import {mockUser} from '../unit/fixtures/mockData';
 
 export let consoleMessage: string;
 console.error = (message: string) => {
   consoleMessage = message;
 };
 
-const mockUser: User = {
-  id: 'testCurrentUserId',
-  username: 'testCurrentUserName',
-  authClientId: 123,
-  permissions: ['1', '2', '3'],
-  role: 'admin',
-  firstName: 'test',
-  lastName: 'lastname',
-  tenantId: 'tenantId',
-  userTenantId: 'userTenantId',
-};
-
 describe('Audit Mixin', () => {
   const testDataSourceInstance = new TestDataSource();
   const getCurrentUser = sinon.stub().resolves(mockUser);

diff --git a/src/__tests__/unit/audit.mixin.unit.ts b/src/__tests__/unit/audit.mixin.unit.ts
@@ -6,7 +6,6 @@ import {
   AuditLog,
   AuditRepositoryMixin,
   IAuditMixinOptions,
-  User,
 } from '../..';
 import {consoleMessage} from '../acceptance/audit.mixin.acceptance';
 import {
@@ -15,7 +14,12 @@ import {
   optionsReceivedByParentRepository,
   resetMethodCalls,
 } from './fixtures/mockClass';
-import {mockData, mockDataArray, resetMockData} from './fixtures/mockData';
+import {
+  mockData,
+  mockDataArray,
+  mockUser,
+  resetMockData,
+} from './fixtures/mockData';
 import {MockModel} from './fixtures/mockModel';
 
 let auditData: AuditLog;
@@ -50,15 +54,6 @@ class MockAuditRepoError {
 const mockOpts: IAuditMixinOptions = {
   actionKey: 'Test_Logs',
 };
-const mockUser: User = {
-  id: 'testCurrentUserId',
-  username: 'testCurrentUserName',
-  role: 'admin',
-  firstName: 'test',
-  lastName: 'lastname',
-  tenantId: 'tenantId',
-  userTenantId: 'userTenantId',
-};
 
 describe('Audit Mixin', () => {
   class ReturnedMixedClass extends AuditRepositoryMixin<

diff --git a/src/__tests__/unit/fixtures/mockData.ts b/src/__tests__/unit/fixtures/mockData.ts
@@ -1,3 +1,4 @@
+import {User} from '../../../types';
 import {MockModel} from './mockModel';
 
 export const mockData: MockModel = {
@@ -26,6 +27,16 @@ export const mockData: MockModel = {
   },
 };
 
+export const mockUser: User = {
+  id: 'testCurrentUserId',
+  username: 'testCurrentUserName',
+  role: 'admin',
+  firstName: 'test',
+  lastName: 'lastname',
+  tenantId: 'tenantId',
+  userTenantId: 'userTenantId',
+};
+
 export const mockDataArray: MockModel[] = [
   {
     id: 'testId1',