From 665e07ae1f08dcfc27c298465fdb81e197113e3a Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 8 Jan 2021 14:56:28 +0100 Subject: [PATCH] Changes based on feedback --- .../+my-dspace-page/my-dspace-page.component.spec.ts | 2 +- src/app/+search-page/search.component.spec.ts | 2 +- src/app/shared/menu/menu.service.spec.ts | 10 ---------- .../search-settings/search-settings.component.spec.ts | 2 +- .../shared/sidebar/page-with-sidebar.component.spec.ts | 2 +- .../{SidebarServiceStub.ts => sidebar-service.stub.ts} | 0 6 files changed, 4 insertions(+), 14 deletions(-) rename src/app/shared/testing/{SidebarServiceStub.ts => sidebar-service.stub.ts} (100%) diff --git a/src/app/+my-dspace-page/my-dspace-page.component.spec.ts b/src/app/+my-dspace-page/my-dspace-page.component.spec.ts index 76b6bd3c96..59581d0da8 100644 --- a/src/app/+my-dspace-page/my-dspace-page.component.spec.ts +++ b/src/app/+my-dspace-page/my-dspace-page.component.spec.ts @@ -28,7 +28,7 @@ import { RoleDirective } from '../shared/roles/role.directive'; import { RoleService } from '../core/roles/role.service'; import { RoleServiceMock } from '../shared/mocks/role-service.mock'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { SidebarServiceStub } from '../shared/testing/SidebarServiceStub'; +import { SidebarServiceStub } from '../shared/testing/sidebar-service.stub'; describe('MyDSpacePageComponent', () => { let comp: MyDSpacePageComponent; diff --git a/src/app/+search-page/search.component.spec.ts b/src/app/+search-page/search.component.spec.ts index 1707976614..2ad497aa49 100644 --- a/src/app/+search-page/search.component.spec.ts +++ b/src/app/+search-page/search.component.spec.ts @@ -24,7 +24,7 @@ import { RouteService } from '../core/services/route.service'; import { SearchConfigurationServiceStub } from '../shared/testing/search-configuration-service.stub'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model'; -import { SidebarServiceStub } from '../shared/testing/SidebarServiceStub'; +import { SidebarServiceStub } from '../shared/testing/sidebar-service.stub'; let comp: SearchComponent; let fixture: ComponentFixture; diff --git a/src/app/shared/menu/menu.service.spec.ts b/src/app/shared/menu/menu.service.spec.ts index 819ccf5e9f..c38cabaa53 100644 --- a/src/app/shared/menu/menu.service.spec.ts +++ b/src/app/shared/menu/menu.service.spec.ts @@ -178,16 +178,6 @@ describe('MenuService', () => { }); describe('when the subsection list is empty', () => { - beforeEach(() => { - /* selectSpy.and.callFake(() => { - return () => { - return () => hot('a', { - a: [] - } - ); - }; - });*/ - }); it('should return false', () => { const result = service.hasSubSections(MenuID.ADMIN, 'fakeId'); diff --git a/src/app/shared/search/search-settings/search-settings.component.spec.ts b/src/app/shared/search/search-settings/search-settings.component.spec.ts index c36fe0701a..cd4a872815 100644 --- a/src/app/shared/search/search-settings/search-settings.component.spec.ts +++ b/src/app/shared/search/search-settings/search-settings.component.spec.ts @@ -15,7 +15,7 @@ import { VarDirective } from '../../utils/var.directive'; import { take } from 'rxjs/operators'; import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component'; import { SidebarService } from '../../sidebar/sidebar.service'; -import { SidebarServiceStub } from '../../testing/SidebarServiceStub'; +import { SidebarServiceStub } from '../../testing/sidebar-service.stub'; describe('SearchSettingsComponent', () => { diff --git a/src/app/shared/sidebar/page-with-sidebar.component.spec.ts b/src/app/shared/sidebar/page-with-sidebar.component.spec.ts index 8e519cddf4..f04632488c 100644 --- a/src/app/shared/sidebar/page-with-sidebar.component.spec.ts +++ b/src/app/shared/sidebar/page-with-sidebar.component.spec.ts @@ -7,7 +7,7 @@ import { of as observableOf } from 'rxjs'; import { PageWithSidebarComponent } from './page-with-sidebar.component'; import { SidebarService } from './sidebar.service'; import { HostWindowService } from '../host-window.service'; -import { SidebarServiceStub } from '../testing/SidebarServiceStub'; +import { SidebarServiceStub } from '../testing/sidebar-service.stub'; describe('PageWithSidebarComponent', () => { let comp: PageWithSidebarComponent; diff --git a/src/app/shared/testing/SidebarServiceStub.ts b/src/app/shared/testing/sidebar-service.stub.ts similarity index 100% rename from src/app/shared/testing/SidebarServiceStub.ts rename to src/app/shared/testing/sidebar-service.stub.ts