AG-1703: use existing agora-testing library rather than creating a ne…

…w agora-mocks library, fix handlers in agora-testing
Sage-Bionetworks · Mar 6, 2025 · 6926ac2 · 6926ac2
1 parent d994555
commit 6926ac2
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 166 deletions.
diff --git a/libs/agora/genes/jest.config.ts b/libs/agora/genes/jest.config.ts
@@ -14,6 +14,7 @@ export default {
       },
     ],
   },
+  testEnvironment: 'jest-fixed-jsdom',
   transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
   snapshotSerializers: [
     'jest-preset-angular/build/serializers/no-ng-attributes',

diff --git a/libs/agora/genes/src/lib/components/popover-link/popover-link.component.spec.ts b/libs/agora/genes/src/lib/components/popover-link/popover-link.component.spec.ts
@@ -1,5 +1,5 @@
-import { synapseWikiMock } from '@sagebionetworks/agora/mocks';
 import { SynapseApiService } from '@sagebionetworks/agora/services';
+import { synapseWikiMock } from '@sagebionetworks/agora/testing';
 import { render, screen, waitFor } from '@testing-library/angular';
 import userEvent from '@testing-library/user-event';
 import { ButtonModule } from 'primeng/button';

diff --git a/libs/agora/mocks/.eslintrc.json b/libs/agora/mocks/.eslintrc.json
diff --git a/libs/agora/mocks/README.md b/libs/agora/mocks/README.md
diff --git a/libs/agora/mocks/project.json b/libs/agora/mocks/project.json
diff --git a/libs/agora/mocks/src/index.ts b/libs/agora/mocks/src/index.ts
diff --git a/libs/agora/mocks/src/lib/synapse-mocks.ts b/libs/agora/mocks/src/lib/synapse-mocks.ts
diff --git a/libs/agora/mocks/tsconfig.json b/libs/agora/mocks/tsconfig.json
diff --git a/libs/agora/mocks/tsconfig.lib.json b/libs/agora/mocks/tsconfig.lib.json
diff --git a/libs/agora/services/jest.config.ts b/libs/agora/services/jest.config.ts
@@ -4,6 +4,7 @@ module.exports = {
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   globals: {},
   coverageDirectory: '../../../coverage/libs/agora/services',
+  testEnvironment: 'jest-fixed-jsdom',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',

diff --git a/libs/agora/services/src/lib/synapse-api.service.spec.ts b/libs/agora/services/src/lib/synapse-api.service.spec.ts
@@ -2,15 +2,15 @@
 // -------------------------------------------------------------------------- //
 // External
 // -------------------------------------------------------------------------- //
-import { TestBed } from '@angular/core/testing';
 import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
 
 // -------------------------------------------------------------------------- //
 // Internal
 // -------------------------------------------------------------------------- //
-import { SynapseApiService } from './synapse-api.service';
-import { synapseWikiMock } from '@sagebionetworks/agora/mocks';
 import { provideHttpClient } from '@angular/common/http';
+import { synapseWikiMock } from '@sagebionetworks/agora/testing';
+import { SynapseApiService } from './synapse-api.service';
 
 // -------------------------------------------------------------------------- //
 // Tests

diff --git a/libs/agora/testing/src/lib/mocks/team-mocks.ts b/libs/agora/testing/src/lib/mocks/team-mocks.ts
@@ -2,12 +2,12 @@
 
 import {
   Team,
-  TeamsList as TeamsResponse,
   TeamMember,
+  TeamsList as TeamsResponse,
 } from '@sagebionetworks/agora/api-client-angular';
 
 export const mockTeamMember: TeamMember = {
-  isPrimaryInvestigator: true,
+  isprimaryinvestigator: true,
   name: 'Philip De Jager',
   url: 'http://www.cumc.columbia.edu/dept/taub/faculty-dejager.html',
 };

diff --git a/libs/agora/testing/src/lib/mocks/team-service-mock.ts b/libs/agora/testing/src/lib/mocks/team-service-mock.ts
@@ -11,9 +11,9 @@ export class MockTeamService extends TeamsService {
       program: 'Test Program',
       description: 'Test Description',
       members: [
-        { name: 'John Doe', isPrimaryInvestigator: true },
-        { name: 'Jane Smith', isPrimaryInvestigator: false },
-        { name: 'Alice Johnson', isPrimaryInvestigator: true },
+        { name: 'John Doe', isprimaryinvestigator: true },
+        { name: 'Jane Smith', isprimaryinvestigator: false },
+        { name: 'Alice Johnson', isprimaryinvestigator: true },
       ],
     });
   }

diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
     "express": "~4.18.2",
     "file-saver": "2.0.5",
     "glob": "11.0.0",
+    "jest-fixed-jsdom": "0.0.9",
     "json5": "2.2.3",
     "lodash": "4.17.21",
     "mariadb": "3.3.1",