mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
Merge branch 'DSpace:main' into issue/2145
This commit is contained in:
@@ -147,7 +147,7 @@ describe('ProcessDetailComponent', () => {
|
|||||||
providers: [
|
providers: [
|
||||||
{
|
{
|
||||||
provide: ActivatedRoute,
|
provide: ActivatedRoute,
|
||||||
useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }) }
|
useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }), snapshot: { params: { id: 1 } } },
|
||||||
},
|
},
|
||||||
{ provide: ProcessDataService, useValue: processService },
|
{ provide: ProcessDataService, useValue: processService },
|
||||||
{ provide: BitstreamDataService, useValue: bitstreamDataService },
|
{ provide: BitstreamDataService, useValue: bitstreamDataService },
|
||||||
@@ -310,10 +310,11 @@ describe('ProcessDetailComponent', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should call refresh method every 5 seconds, until process is completed', fakeAsync(() => {
|
it('should call refresh method every 5 seconds, until process is completed', fakeAsync(() => {
|
||||||
spyOn(component, 'refresh');
|
spyOn(component, 'refresh').and.callThrough();
|
||||||
spyOn(component, 'stopRefreshTimer');
|
spyOn(component, 'stopRefreshTimer').and.callThrough();
|
||||||
|
|
||||||
process.processStatus = ProcessStatus.COMPLETED;
|
// start off with a running process in order for the refresh counter starts counting up
|
||||||
|
process.processStatus = ProcessStatus.RUNNING;
|
||||||
// set findbyId to return a completed process
|
// set findbyId to return a completed process
|
||||||
(processService.findById as jasmine.Spy).and.returnValue(observableOf(createSuccessfulRemoteDataObject(process)));
|
(processService.findById as jasmine.Spy).and.returnValue(observableOf(createSuccessfulRemoteDataObject(process)));
|
||||||
|
|
||||||
@@ -336,6 +337,10 @@ describe('ProcessDetailComponent', () => {
|
|||||||
tick(1001); // 1 second + 1 ms by the setTimeout
|
tick(1001); // 1 second + 1 ms by the setTimeout
|
||||||
expect(component.refreshCounter$.value).toBe(0); // 1 - 1
|
expect(component.refreshCounter$.value).toBe(0); // 1 - 1
|
||||||
|
|
||||||
|
// set the process to completed right before the counter checks the process
|
||||||
|
process.processStatus = ProcessStatus.COMPLETED;
|
||||||
|
(processService.findById as jasmine.Spy).and.returnValue(observableOf(createSuccessfulRemoteDataObject(process)));
|
||||||
|
|
||||||
tick(1000); // 1 second
|
tick(1000); // 1 second
|
||||||
|
|
||||||
expect(component.refresh).toHaveBeenCalledTimes(1);
|
expect(component.refresh).toHaveBeenCalledTimes(1);
|
||||||
|
@@ -11743,9 +11743,9 @@ wildcard@^2.0.0:
|
|||||||
integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
|
integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
|
||||||
|
|
||||||
word-wrap@^1.2.3, word-wrap@~1.2.3:
|
word-wrap@^1.2.3, word-wrap@~1.2.3:
|
||||||
version "1.2.3"
|
version "1.2.5"
|
||||||
resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
|
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
|
||||||
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
|
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
|
||||||
|
|
||||||
wrap-ansi@^6.2.0:
|
wrap-ansi@^6.2.0:
|
||||||
version "6.2.0"
|
version "6.2.0"
|
||||||
|
Reference in New Issue
Block a user