Skip to content

Commit 27731f0

Browse files
nsemetsNazar690
andauthored
Test/updated mocks (#652)
* test(testing): updated mocks * fix(updates): core --------- Co-authored-by: Nazar Semets <nazar690@gmail.com>
1 parent 224e4cf commit 27731f0

File tree

139 files changed

+170
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+170
-142
lines changed

jest.config.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@ module.exports = {
2828
coverageDirectory: 'coverage',
2929
collectCoverageFrom: [
3030
'src/app/**/*.{ts,js}',
31+
'!src/app/core/themes/**',
3132
'!src/app/app.config.ts',
3233
'!src/app/**/*.routes.{ts.js}',
3334
'!src/app/**/*.models.{ts.js}',
3435
'!src/app/**/*.model.{ts.js}',
36+
'!src/app/**/models/*.{ts,js}',
37+
'!src/app/shared/models/**',
3538
'!src/app/**/*.route.{ts,js}',
3639
'!src/app/**/*.enum.{ts,js}',
3740
'!src/app/**/*.type.{ts,js}',
@@ -43,10 +46,10 @@ module.exports = {
4346
extensionsToTreatAsEsm: ['.ts'],
4447
coverageThreshold: {
4548
global: {
46-
branches: 15,
47-
functions: 18.22,
48-
lines: 43.77,
49-
statements: 44.42,
49+
branches: 24.1,
50+
functions: 28.73,
51+
lines: 56.52,
52+
statements: 56.82,
5053
},
5154
},
5255
watchPathIgnorePatterns: [

src/app/app.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ import { GetCurrentUser, UserState } from '@core/store/user';
1414
import { UserEmailsState } from '@core/store/user-emails';
1515
import { CustomDialogService } from '@shared/services';
1616

17+
import { TranslateServiceMock } from '../testing/mocks';
18+
1719
import { FullScreenLoaderComponent, ToastComponent } from './shared/components';
18-
import { TranslateServiceMock } from './shared/mocks';
1920
import { AppComponent } from './app.component';
2021

2122
import { OSFTestingModule } from '@testing/osf.testing.module';

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import { signal } from '@angular/core';
99
import { ComponentFixture, TestBed } from '@angular/core/testing';
1010

1111
import { UserSelectors } from '@osf/core/store/user';
12-
import { MOCK_STORE, MOCK_USER } from '@osf/shared/mocks';
1312

1413
import { BreadcrumbComponent } from '../breadcrumb/breadcrumb.component';
1514

1615
import { HeaderComponent } from './header.component';
1716

17+
import { MOCK_STORE, MOCK_USER } from '@testing/mocks';
18+
1819
describe('HeaderComponent', () => {
1920
let component: HeaderComponent;
2021
let fixture: ComponentFixture<HeaderComponent>;

src/app/core/components/osf-banners/tos-consent-banner/tos-consent-banner.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import { By } from '@angular/platform-browser';
99

1010
import { AcceptTermsOfServiceByUser } from '@core/store/user';
1111
import { UserSelectors } from '@osf/core/store/user';
12-
import { MOCK_USER } from '@osf/shared/mocks';
1312
import { IconComponent } from '@shared/components';
1413

1514
import { TosConsentBannerComponent } from './tos-consent-banner.component';
1615

16+
import { MOCK_USER } from '@testing/mocks';
1717
import { TranslationServiceMock } from '@testing/mocks/translation.service.mock';
1818
import { OSFTestingStoreModule } from '@testing/osf.testing.module';
1919
import { provideMockStore } from '@testing/providers/store-provider.mock';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import { InstitutionsAdminState } from '@osf/features/admin-institutions/store';
1313
import { CustomDialogService, ToastService } from '@osf/shared/services';
1414
import { InstitutionsSearchState } from '@osf/shared/stores/institutions-search';
1515
import { LoadingSpinnerComponent, SelectComponent } from '@shared/components';
16-
import { TranslateServiceMock } from '@shared/mocks';
1716

1817
import { InstitutionsUsersComponent } from './institutions-users.component';
1918

19+
import { TranslateServiceMock } from '@testing/mocks';
2020
import { OSFTestingModule } from '@testing/osf.testing.module';
2121
import { CustomDialogServiceMockBuilder } from '@testing/providers/custom-dialog-provider.mock';
2222

src/app/features/analytics/analytics.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import {
1717
ViewOnlyLinkMessageComponent,
1818
} from '@shared/components';
1919
import { IS_WEB } from '@shared/helpers';
20-
import { MOCK_ANALYTICS_METRICS, MOCK_RELATED_COUNTS, MOCK_RESOURCE_OVERVIEW } from '@shared/mocks';
2120

21+
import { MOCK_ANALYTICS_METRICS, MOCK_RELATED_COUNTS, MOCK_RESOURCE_OVERVIEW } from '@testing/mocks';
2222
import { OSFTestingModule } from '@testing/osf.testing.module';
2323
import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock';
2424
import { RouterMockBuilder } from '@testing/providers/router-provider.mock';

src/app/features/analytics/components/view-duplicates/view-duplicates.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import {
1919
SubHeaderComponent,
2020
TruncatedTextComponent,
2121
} from '@shared/components';
22-
import { MOCK_PROJECT_OVERVIEW } from '@shared/mocks';
2322
import { CustomDialogService } from '@shared/services';
2423

2524
import { ViewDuplicatesComponent } from './view-duplicates.component';
2625

26+
import { MOCK_PROJECT_OVERVIEW } from '@testing/mocks';
2727
import { OSFTestingModule } from '@testing/osf.testing.module';
2828
import { CustomDialogServiceMockBuilder } from '@testing/providers/custom-dialog-provider.mock';
2929
import { ActivatedRouteMockBuilder } from '@testing/providers/route-provider.mock';

src/app/features/auth/pages/reset-password/reset-password.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import { ActivatedRoute } from '@angular/router';
99
import { AuthService } from '@osf/core/services';
1010
import { ResetPasswordComponent } from '@osf/features/auth/pages';
1111
import { PasswordInputHintComponent } from '@osf/shared/components';
12-
import { TranslateServiceMock } from '@osf/shared/mocks';
12+
13+
import { TranslateServiceMock } from '@testing/mocks';
1314

1415
describe('ResetPasswordComponent', () => {
1516
let component: ResetPasswordComponent;

src/app/features/auth/pages/sign-up/sign-up.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ import { ActivatedRoute } from '@angular/router';
77
import { AuthService } from '@osf/core/services';
88
import { PasswordInputHintComponent } from '@osf/shared/components';
99
import { ToastService } from '@osf/shared/services';
10-
import { TranslateServiceMock } from '@shared/mocks';
1110

1211
import { SignUpComponent } from './sign-up.component';
1312

13+
import { TranslateServiceMock } from '@testing/mocks';
14+
1415
describe('SignUpComponent', () => {
1516
let component: SignUpComponent;
1617
let fixture: ComponentFixture<SignUpComponent>;

src/app/features/collections/components/add-to-collection/add-to-collection.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import { ProjectMetadataStepComponent } from '@osf/features/collections/componen
1111
import { SelectProjectStepComponent } from '@osf/features/collections/components/add-to-collection/select-project-step/select-project-step.component';
1212
import { AddToCollectionSteps } from '@osf/features/collections/enums';
1313
import { LoadingSpinnerComponent } from '@shared/components';
14-
import { MOCK_PROVIDER, MOCK_USER } from '@shared/mocks';
1514
import { CustomDialogService } from '@shared/services';
1615
import { CollectionsSelectors } from '@shared/stores';
1716
import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors';
1817

1918
import { AddToCollectionComponent } from './add-to-collection.component';
2019

20+
import { MOCK_PROVIDER, MOCK_USER } from '@testing/mocks';
2121
import { MOCK_PROJECT } from '@testing/mocks/project.mock';
2222
import { OSFTestingModule } from '@testing/osf.testing.module';
2323
import { CustomDialogServiceMockBuilder } from '@testing/providers/custom-dialog-provider.mock';

0 commit comments

Comments
 (0)