hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-13 21:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes after merge with master

Browse Source
This commit is contained in:
lotte
2022-04-20 14:48:18 +02:00
parent 6784ac39f6
commit 014fe1b733
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/auth/selectors.ts
View File

@@ -8,7 +8,7 @@ import { createSelector } from '@ngrx/store';
*/ */
import { AuthState } from './auth.reducer'; import { AuthState } from './auth.reducer';
import { AppState } from '../../app.reducer'; import { AppState } from '../../app.reducer';
import { CoreState } from '../core.reducers'; import { CoreState } from '../core-state.model';
import { coreSelector } from '../core.selectors'; import { coreSelector } from '../core.selectors';
/** /**

12
src/app/core/shared/search/search-configuration.service.spec.ts
View File

@@ -1,3 +1,4 @@
/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
import { SearchConfigurationService } from './search-configuration.service'; import { SearchConfigurationService } from './search-configuration.service';
import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
@@ -47,11 +48,8 @@ describe('SearchConfigurationService', () => {
const linkService: any = {}; const linkService: any = {};
const requestService: any = getMockRequestService(); const requestService: any = getMockRequestService();
const halService: any = { const halService: any = {
/* tslint:disable:no-empty */
getEndpoint: () => { getEndpoint: () => {
} }
/* tslint:enable:no-empty */
}; };
const rdb: any = { const rdb: any = {
@@ -199,10 +197,8 @@ describe('SearchConfigurationService', () => {
const requestUrl = endPoint + '?scope=' + scope; const requestUrl = endPoint + '?scope=' + scope;
beforeEach(() => { beforeEach(() => {
spyOn((service as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint)); spyOn((service as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
/* tslint:disable:no-empty */
service.getSearchConfigurationFor(scope).subscribe((t) => { service.getSearchConfigurationFor(scope).subscribe((t) => {
}); // subscribe to make sure all methods are called }); // subscribe to make sure all methods are called
/* tslint:enable:no-empty */
}); });
it('should call getEndpoint on the halService', () => { it('should call getEndpoint on the halService', () => {
@@ -223,10 +219,8 @@ describe('SearchConfigurationService', () => {
beforeEach(() => { beforeEach(() => {
spyOn((service as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint)); spyOn((service as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
spyOn((service as any).rdb, 'buildFromHref').and.callThrough(); spyOn((service as any).rdb, 'buildFromHref').and.callThrough();
/* tslint:disable:no-empty */
service.getSearchConfigurationFor(null).subscribe((t) => { service.getSearchConfigurationFor(null).subscribe((t) => {
}); // subscribe to make sure all methods are called }); // subscribe to make sure all methods are called
/* tslint:enable:no-empty */
}); });
it('should call getEndpoint on the halService', () => { it('should call getEndpoint on the halService', () => {
@@ -246,10 +240,8 @@ describe('SearchConfigurationService', () => {
beforeEach(() => { beforeEach(() => {
spyOn((service as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint)); spyOn((service as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
spyOn((service as any).rdb, 'buildFromHref').and.callThrough(); spyOn((service as any).rdb, 'buildFromHref').and.callThrough();
/* tslint:disable:no-empty */
service.getConfig(null).subscribe((t) => { service.getConfig(null).subscribe((t) => {
}); // subscribe to make sure all methods are called }); // subscribe to make sure all methods are called
/* tslint:enable:no-empty */
}); });
it('should call getEndpoint on the halService', () => { it('should call getEndpoint on the halService', () => {
@@ -271,10 +263,8 @@ describe('SearchConfigurationService', () => {
const requestUrl = endPoint + '?scope=' + scope; const requestUrl = endPoint + '?scope=' + scope;
beforeEach(() => { beforeEach(() => {
spyOn((service as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint)); spyOn((service as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
/* tslint:disable:no-empty */
service.getConfig(scope).subscribe((t) => { service.getConfig(scope).subscribe((t) => {
}); // subscribe to make sure all methods are called }); // subscribe to make sure all methods are called
/* tslint:enable:no-empty */
}); });
it('should call getEndpoint on the halService', () => { it('should call getEndpoint on the halService', () => {