From 63521f012188642bc3075fec653b4a297e2c0efc Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 14 Dec 2023 10:26:20 +0100 Subject: [PATCH] Revert "[DURACOM-191] fix various tests" This reverts commit 1b158dd5f6f251014ea4b3db250c6c11b9734dda. --- .../epeople-registry/epeople-registry.component.spec.ts | 4 +--- .../forgot-password-email/forgot-email.component.spec.ts | 4 +--- src/app/header/header.component.spec.ts | 2 -- .../register-email/register-email.component.spec.ts | 4 +--- src/app/shared/search/search.component.spec.ts | 5 +++-- .../submission-import-external.component.spec.ts | 6 +----- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts index 40027f1380..975c8071b1 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts @@ -1,4 +1,4 @@ -import { ActivatedRoute, Router } from '@angular/router'; +import { Router } from '@angular/router'; import { Observable, of as observableOf } from 'rxjs'; import { CommonModule } from '@angular/common'; import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; @@ -30,7 +30,6 @@ import { FindListOptions } from '../../core/data/find-list-options.model'; import { EPersonFormComponent } from './eperson-form/eperson-form.component'; import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { PaginationComponent } from '../../shared/pagination/pagination.component'; -import { MockActivatedRoute } from '../../shared/mocks/active-router.mock'; describe('EPeopleRegistryComponent', () => { let component: EPeopleRegistryComponent; @@ -135,7 +134,6 @@ describe('EPeopleRegistryComponent', () => { } }), EPeopleRegistryComponent], providers: [ - { provide: ActivatedRoute, useValue: new MockActivatedRoute() }, {provide: EPersonDataService, useValue: ePersonDataServiceStub}, {provide: NotificationsService, useValue: new NotificationsServiceStub()}, {provide: AuthorizationDataService, useValue: authorizationService}, diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts b/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts index 13d427b4ee..5feafd26a5 100644 --- a/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts +++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts @@ -1,11 +1,10 @@ import { ForgotEmailComponent } from './forgot-email.component'; -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RegisterEmailFormComponent } from '../../register-email-form/register-email-form.component'; -import { provideMockStore } from '@ngrx/store/testing'; describe('ForgotEmailComponent', () => { let comp: ForgotEmailComponent; @@ -14,7 +13,6 @@ describe('ForgotEmailComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [CommonModule, TranslateModule.forRoot(), ReactiveFormsModule, ForgotEmailComponent], - providers: [provideMockStore()], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) .overrideComponent(ForgotEmailComponent, { diff --git a/src/app/header/header.component.spec.ts b/src/app/header/header.component.spec.ts index 8ce9756423..a15f3d9421 100644 --- a/src/app/header/header.component.spec.ts +++ b/src/app/header/header.component.spec.ts @@ -20,7 +20,6 @@ import { ThemedAuthNavMenuComponent } from '../shared/auth-nav-menu/themed-auth- import { ImpersonateNavbarComponent } from '../shared/impersonate-navbar/impersonate-navbar.component'; import { HostWindowService } from '../shared/host-window.service'; import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub'; -import { provideMockStore } from '@ngrx/store/testing'; let comp: HeaderComponent; let fixture: ComponentFixture; @@ -45,7 +44,6 @@ describe('HeaderComponent', () => { HeaderComponent ], providers: [ - provideMockStore(), { provide: MenuService, useValue: menuService }, { provide: ActivatedRoute, useValue: new ActivatedRouteStub()}, { provide: LocaleService, useValue: mockLocaleService }, diff --git a/src/app/register-page/register-email/register-email.component.spec.ts b/src/app/register-page/register-email/register-email.component.spec.ts index bf5af99629..a8e3b640cf 100644 --- a/src/app/register-page/register-email/register-email.component.spec.ts +++ b/src/app/register-page/register-email/register-email.component.spec.ts @@ -1,11 +1,10 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; import { ReactiveFormsModule } from '@angular/forms'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { RegisterEmailComponent } from './register-email.component'; import { RegisterEmailFormComponent } from '../../register-email-form/register-email-form.component'; -import { provideMockStore } from '@ngrx/store/testing'; describe('RegisterEmailComponent', () => { @@ -14,7 +13,6 @@ describe('RegisterEmailComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - providers: [provideMockStore()], imports: [CommonModule, TranslateModule.forRoot(), ReactiveFormsModule, RegisterEmailComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts index 8ffd308c61..3cf3543a34 100644 --- a/src/app/shared/search/search.component.spec.ts +++ b/src/app/shared/search/search.component.spec.ts @@ -39,7 +39,6 @@ import { ThemedSearchResultsComponent } from './search-results/themed-search-res import { ThemedSearchSidebarComponent } from './search-sidebar/themed-search-sidebar.component'; import { ThemedSearchFormComponent } from '../search-form/themed-search-form.component'; import { SearchLabelsComponent } from './search-labels/search-labels.component'; -import { provideMockStore } from '@ngrx/store/testing'; let comp: SearchComponent; let fixture: ComponentFixture; @@ -210,7 +209,9 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar }, { provide: ActivatedRoute, useValue: activatedRouteStub }, { provide: RouteService, useValue: routeServiceStub }, - provideMockStore(), + { + provide: Store, useValue: store + }, { provide: HostWindowService, useValue: jasmine.createSpyObj('hostWindowService', { isXs: observableOf(true), diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts index 8c85b10d31..f9b25f6a25 100644 --- a/src/app/submission/import-external/submission-import-external.component.spec.ts +++ b/src/app/submission/import-external/submission-import-external.component.spec.ts @@ -25,9 +25,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model'; -import { - SubmissionImportExternalPreviewComponent -} from './import-external-preview/submission-import-external-preview.component'; +import { SubmissionImportExternalPreviewComponent } from './import-external-preview/submission-import-external-preview.component'; import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { HostWindowService } from '../../shared/host-window.service'; @@ -38,7 +36,6 @@ import { } from './import-external-searchbar/submission-import-external-searchbar.component'; import { ThemeService } from '../../shared/theme-support/theme.service'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; -import { provideMockStore } from '@ngrx/store/testing'; describe('SubmissionImportExternalComponent test suite', () => { let comp: SubmissionImportExternalComponent; @@ -68,7 +65,6 @@ describe('SubmissionImportExternalComponent test suite', () => { VarDirective ], providers: [ - provideMockStore(), { provide: ExternalSourceDataService, useValue: mockExternalSourceService }, { provide: SearchConfigurationService, useValue: searchConfigServiceStub }, { provide: RouteService, useValue: routeServiceStub },