Merge remote-tracking branch 'origin/main' into feat/registry-submit-decision

Author: nsemets

jest.config.js

@@ -30,4 +30,11 @@ module.exports = {
     '!src/app/**/public-api.ts',
   ],
   extensionsToTreatAsEsm: ['.ts'],
+  testPathIgnorePatterns: [
+    '<rootDir>/src/app/features/registry/',
+    '<rootDir>/src/app/features/project/',
+    '<rootDir>/src/app/features/registries/',
+    '<rootDir>/src/app/features/settings/',
+    '<rootDir>/src/app/shared/',
+  ],
 };

src/app/core/components/footer/footer.component.spec.ts

@@ -1,19 +1,27 @@
 import { TranslatePipe, TranslateService } from '@ngx-translate/core';
-import { MockPipe, MockProvider } from 'ng-mocks';
+import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
+
+import { BehaviorSubject } from 'rxjs';
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
+import { IconComponent } from '@shared/components';
+import { IS_WEB } from '@shared/utils';
+
 import { FooterComponent } from './footer.component';
 
 describe('FooterComponent', () => {
   let component: FooterComponent;
   let fixture: ComponentFixture<FooterComponent>;
+  let isWebSubject: BehaviorSubject<boolean>;
 
   beforeEach(async () => {
+    isWebSubject = new BehaviorSubject<boolean>(true);
+
     await TestBed.configureTestingModule({
-      imports: [FooterComponent, MockPipe(TranslatePipe)],
-      providers: [MockProvider(TranslateService), MockProvider(ActivatedRoute)],
+      imports: [FooterComponent, MockComponent(IconComponent), MockPipe(TranslatePipe)],
+      providers: [MockProvider(TranslateService), MockProvider(ActivatedRoute), MockProvider(IS_WEB, isWebSubject)],
     }).compileComponents();
 
     fixture = TestBed.createComponent(FooterComponent);

src/app/core/constants/ngxs-states.constant.ts

@@ -9,10 +9,9 @@ import { DeveloperAppsState } from '@osf/features/settings/developer-apps/store'
 import { NotificationSubscriptionState } from '@osf/features/settings/notifications/store';
 import { AddonsState, InstitutionsState, WikiState } from '@shared/stores';
 import { LicensesState } from '@shared/stores/licenses';
+import { MyResourcesState } from '@shared/stores/my-resources';
 import { RegionsState } from '@shared/stores/regions';
 
-import { MyResourcesState } from 'src/app/shared/stores/my-resources';
-
 export const STATES = [
   AddonsState,
   UserState,

src/app/features/admin-institutions/admin-institutions.component.spec.ts

@@ -1,14 +1,38 @@
+import { provideStore } from '@ngxs/store';
+
+import { MockComponents, MockProvider } from 'ng-mocks';
+
+import { provideHttpClient } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { LoadingSpinnerComponent, SelectComponent } from '@shared/components';
+import { InstitutionsSearchState } from '@shared/stores';
 
 import { AdminInstitutionsComponent } from './admin-institutions.component';
 
 describe('AdminInstitutionsComponent', () => {
   let component: AdminInstitutionsComponent;
   let fixture: ComponentFixture<AdminInstitutionsComponent>;
 
+  const mockActivatedRoute = {
+    snapshot: {
+      params: { 'institution-id': '42' },
+      firstChild: { routeConfig: { path: 'summary' } },
+    },
+  };
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [AdminInstitutionsComponent],
+      imports: [AdminInstitutionsComponent, ...MockComponents(LoadingSpinnerComponent, SelectComponent)],
+      providers: [
+        { provide: ActivatedRoute, useValue: mockActivatedRoute },
+        MockProvider(Router),
+        provideStore([InstitutionsSearchState]),
+        provideHttpClient(),
+        provideHttpClientTesting(),
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(AdminInstitutionsComponent);

src/app/features/admin-institutions/components/admin-table/admin-table.component.spec.ts

@@ -1,18 +1,39 @@
+import { TranslatePipe, TranslateService } from '@ngx-translate/core';
+import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
+
+import { DatePipe } from '@angular/common';
+import { ComponentRef } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { TableCellData, TableColumn } from '@osf/features/admin-institutions/models';
+import { CustomPaginatorComponent } from '@shared/components';
+
 import { AdminTableComponent } from './admin-table.component';
 
 describe('AdminTableComponent', () => {
   let component: AdminTableComponent;
+  let componentRef: ComponentRef<AdminTableComponent>;
   let fixture: ComponentFixture<AdminTableComponent>;
+  const mockColumns: TableColumn[] = [];
+  const mockData: TableCellData[] = [];
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [AdminTableComponent],
+      imports: [
+        AdminTableComponent,
+        MockComponent(CustomPaginatorComponent),
+        MockPipe(TranslatePipe),
+        MockPipe(DatePipe),
+      ],
+      providers: [MockProvider(TranslateService)],
     }).compileComponents();
 
     fixture = TestBed.createComponent(AdminTableComponent);
     component = fixture.componentInstance;
+    componentRef = fixture.componentRef;
+
+    componentRef.setInput('tableColumns', mockColumns);
+    componentRef.setInput('tableData', mockData);
     fixture.detectChanges();
   });
 

src/app/features/admin-institutions/dialogs/send-email-dialog/send-email-dialog.component.spec.ts

@@ -1,3 +1,8 @@
+import { TranslatePipe } from '@ngx-translate/core';
+import { MockPipe, MockProviders } from 'ng-mocks';
+
+import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
+
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { SendEmailDialogComponent } from './send-email-dialog.component';
@@ -8,7 +13,8 @@ describe('SendEmailDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [SendEmailDialogComponent],
+      imports: [SendEmailDialogComponent, MockPipe(TranslatePipe)],
+      providers: [MockProviders(DynamicDialogRef, DynamicDialogConfig)],
     }).compileComponents();
 
     fixture = TestBed.createComponent(SendEmailDialogComponent);

src/app/features/admin-institutions/pages/institutions-preprints/institutions-preprints.component.spec.ts

@@ -1,14 +1,46 @@
+import { provideStore } from '@ngxs/store';
+
+import { TranslatePipe } from '@ngx-translate/core';
+import { MockComponents, MockPipe, MockProviders } from 'ng-mocks';
+
+import { of } from 'rxjs';
+
+import { provideHttpClient } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { AdminTableComponent } from '@osf/features/admin-institutions/components';
+import { InstitutionsAdminState } from '@osf/features/admin-institutions/store';
+import { LoadingSpinnerComponent } from '@shared/components';
+import { InstitutionsSearchState } from '@shared/stores';
 
 import { InstitutionsPreprintsComponent } from './institutions-preprints.component';
 
 describe('InstitutionsPreprintsComponent', () => {
   let component: InstitutionsPreprintsComponent;
   let fixture: ComponentFixture<InstitutionsPreprintsComponent>;
 
+  const mockRoute = {
+    parent: { snapshot: { params: { 'institution-id': '42' } } },
+    snapshot: { queryParams: {} },
+    queryParams: of({}),
+  };
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [InstitutionsPreprintsComponent],
+      imports: [
+        InstitutionsPreprintsComponent,
+        ...MockComponents(AdminTableComponent, LoadingSpinnerComponent),
+        MockPipe(TranslatePipe),
+      ],
+      providers: [
+        MockProviders(Router),
+        { provide: ActivatedRoute, useValue: mockRoute },
+        provideStore([InstitutionsAdminState, InstitutionsSearchState]),
+        provideHttpClient(),
+        provideHttpClientTesting(),
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(InstitutionsPreprintsComponent);

src/app/features/admin-institutions/pages/institutions-projects/institutions-projects.component.spec.ts

@@ -1,4 +1,19 @@
+import { provideStore } from '@ngxs/store';
+
+import { TranslatePipe } from '@ngx-translate/core';
+import { MockComponents, MockPipe, MockProvider } from 'ng-mocks';
+
+import { of } from 'rxjs';
+
+import { provideHttpClient } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+
+import { AdminTableComponent } from '@osf/features/admin-institutions/components';
+import { InstitutionsAdminState } from '@osf/features/admin-institutions/store';
+import { LoadingSpinnerComponent } from '@shared/components';
+import { InstitutionsSearchState } from '@shared/stores';
 
 import { InstitutionsProjectsComponent } from './institutions-projects.component';
 
@@ -8,7 +23,17 @@ describe('InstitutionsProjectsComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [InstitutionsProjectsComponent],
+      imports: [
+        InstitutionsProjectsComponent,
+        ...MockComponents(AdminTableComponent, LoadingSpinnerComponent),
+        MockPipe(TranslatePipe),
+      ],
+      providers: [
+        MockProvider(ActivatedRoute, { queryParams: of({}) }),
+        provideStore([InstitutionsAdminState, InstitutionsSearchState]),
+        provideHttpClient(),
+        provideHttpClientTesting(),
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(InstitutionsProjectsComponent);

src/app/features/admin-institutions/pages/institutions-registrations/institutions-registrations.component.spec.ts

@@ -1,4 +1,18 @@
+import { provideStore } from '@ngxs/store';
+
+import { MockComponents, MockProvider } from 'ng-mocks';
+
+import { of } from 'rxjs';
+
+import { provideHttpClient } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { AdminTableComponent } from '@osf/features/admin-institutions/components';
+import { InstitutionsAdminState } from '@osf/features/admin-institutions/store';
+import { LoadingSpinnerComponent } from '@shared/components';
+import { InstitutionsSearchState } from '@shared/stores';
 
 import { InstitutionsRegistrationsComponent } from './institutions-registrations.component';
 
@@ -8,7 +22,14 @@ describe('InstitutionsRegistrationsComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [InstitutionsRegistrationsComponent],
+      imports: [InstitutionsRegistrationsComponent, ...MockComponents(AdminTableComponent, LoadingSpinnerComponent)],
+      providers: [
+        MockProvider(ActivatedRoute, { queryParams: of({}) }),
+        MockProvider(Router),
+        provideStore([InstitutionsAdminState, InstitutionsSearchState]),
+        provideHttpClient(),
+        provideHttpClientTesting(),
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(InstitutionsRegistrationsComponent);

src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.spec.ts

@@ -1,4 +1,18 @@
+import { provideStore } from '@ngxs/store';
+
+import { TranslatePipe, TranslateService } from '@ngx-translate/core';
+import { MockComponents, MockPipe, MockProvider } from 'ng-mocks';
+
+import { of } from 'rxjs';
+
+import { provideHttpClient } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+
+import { InstitutionsAdminState } from '@osf/features/admin-institutions/store';
+import { BarChartComponent, LoadingSpinnerComponent, StatisticCardComponent } from '@shared/components';
+import { DoughnutChartComponent } from '@shared/components/doughnut-chart/doughnut-chart.component';
 
 import { InstitutionsSummaryComponent } from './institutions-summary.component';
 
@@ -8,7 +22,18 @@ describe('InstitutionsSummaryComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [InstitutionsSummaryComponent],
+      imports: [
+        InstitutionsSummaryComponent,
+        ...MockComponents(StatisticCardComponent, LoadingSpinnerComponent, DoughnutChartComponent, BarChartComponent),
+        MockPipe(TranslatePipe),
+      ],
+      providers: [
+        MockProvider(ActivatedRoute, { queryParams: of({}) }),
+        MockProvider(TranslateService),
+        provideStore([InstitutionsAdminState]),
+        provideHttpClient(),
+        provideHttpClientTesting(),
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(InstitutionsSummaryComponent);