Skip to content

Commit d94b5c1

Browse files
Andrea Barbassovins01-4science
authored andcommitted
Merged in task/dspace-cris-2023_02_x/DSC-2166 (pull request DSpace#2770)
[DSC-2166] fix tests failing because of multiple spy registrations Approved-by: Francesco Molinaro
2 parents cd04bef + 093de86 commit d94b5c1

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

src/app/lucky-search/search/lucky-search.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ describe('LuckySearchComponent', () => {
139139
}
140140
})
141141
});
142-
spyOn(routerStub, 'parseUrl').and.returnValue(urlTree);
142+
routerStub.parseUrl.and.returnValue(urlTree);
143143
const data = createSuccessfulRemoteDataObject(createPaginatedList([
144144
firstSearchResult, secondSearchResult
145145
]));
@@ -203,7 +203,7 @@ describe('LuckySearchComponent', () => {
203203
spyOn((component as any), 'loadBitstreamsAndRedirectIfNeeded').and.returnValue(observableOf([bitstream]));
204204
spyOn((component as any), 'hasBitstreamFilters').and.returnValue(true);
205205
spyOn(component, 'redirect');
206-
spyOn(routerStub, 'parseUrl').and.returnValue(bitstreamSearchTree);
206+
routerStub.parseUrl.and.returnValue(bitstreamSearchTree);
207207

208208
component.resultsRD$.next(data);
209209

@@ -266,7 +266,7 @@ describe('LuckySearchComponent', () => {
266266
spyOn((component as any), 'loadBitstreamsAndRedirectIfNeeded').and.returnValue(observableOf([bitstream]));
267267
spyOn((component as any), 'hasBitstreamFilters').and.returnValue(true);
268268
spyOn(component, 'redirect');
269-
spyOn(routerStub, 'parseUrl').and.returnValue(bitstreamSearchTree);
269+
routerStub.parseUrl.and.returnValue(bitstreamSearchTree);
270270

271271
component.resultsRD$.next(data);
272272

src/app/shared/mocks/router.mock.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export class RouterMock {
1818
// noinspection TypeScriptUnresolvedFunction
1919
navigate = jasmine.createSpy('navigate');
2020
navigateByUrl = jasmine.createSpy('navigateByUrl');
21+
parseUrl = jasmine.createSpy('parseUrl');
2122

2223
serializeUrl(url: UrlTree): string {
2324
return url ? url.toString() : '';
@@ -38,8 +39,4 @@ export class RouterMock {
3839
get url() {
3940
return this.routerState.snapshot.url;
4041
}
41-
42-
parseUrl(url: string): UrlTree {
43-
return null;
44-
}
4542
}

0 commit comments

Comments
 (0)