@@ -2,7 +2,6 @@ import { TestBed, inject, fakeAsync, tick } from '@angular/core/testing';
2
2
3
3
import { NgxUiLoaderService } from './ngx-ui-loader.service' ;
4
4
import { DEFAULT_CONFIG } from '../utils/constants' ;
5
- import { NgxUiLoaderModule } from './ngx-ui-loader.module' ;
6
5
7
6
// DO NOT change the following constants {{{
8
7
const BACKGROUND = false ;
@@ -18,7 +17,7 @@ const FOREGROUND = true;
18
17
const IS_BOUND = true ;
19
18
const IS_MASTER = true ;
20
19
const LOADER_ID_01 = 'loader-id-01' ;
21
- const MIN_TIME = 500 ;
20
+ const MIN_TIME = 300 ;
22
21
const MAX_TIME = 8000 ;
23
22
const NOT_EXISTING_LOADER_ID = 'not-existing-loader-id' ;
24
23
const NOT_EXISTING_TASK_ID = 'not-existing-task-id' ;
@@ -33,14 +32,24 @@ describe('NgxUiLoaderService with custom config', () => {
33
32
expect ( loaderService . getDefaultConfig ( ) ) . toEqual ( DEFAULT_CONFIG ) ;
34
33
} ) ;
35
34
36
- it ( ' NgxUiLoaderService({ minTime: 20 }) should return DEFAUL_CONFIG' , ( ) => {
37
- const loaderService = new NgxUiLoaderService ( { minTime : 20 } ) ;
38
- expect ( loaderService . getDefaultConfig ( ) ) . toEqual ( { ...DEFAULT_CONFIG , minTime : 20 } ) ;
35
+ it ( ` NgxUiLoaderService({ minTime: - 20 }) should return minTime: ${ MIN_TIME } ` , ( ) => {
36
+ const loaderService = new NgxUiLoaderService ( { minTime : - 20 } ) ;
37
+ expect ( loaderService . getDefaultConfig ( ) ) . toEqual ( { ...DEFAULT_CONFIG , minTime : MIN_TIME } ) ;
39
38
} ) ;
40
39
41
- it ( 'NgxUiLoaderService({ minTime: -20 }) should return DEFAUL_CONFIG' , ( ) => {
42
- const loaderService = new NgxUiLoaderService ( { minTime : - 20 } ) ;
43
- expect ( loaderService . getDefaultConfig ( ) ) . toEqual ( DEFAULT_CONFIG ) ;
40
+ it ( `NgxUiLoaderService({ minTime: ${ MIN_TIME - 1 } }) should return DEFAUL_CONFIG` , ( ) => {
41
+ const loaderService = new NgxUiLoaderService ( { minTime : MIN_TIME - 1 } ) ;
42
+ expect ( loaderService . getDefaultConfig ( ) ) . toEqual ( { ...DEFAULT_CONFIG , minTime : MIN_TIME } ) ;
43
+ } ) ;
44
+
45
+ it ( `NgxUiLoaderService({ minTime: ${ MIN_TIME } }) should return minTime: ${ MIN_TIME } ` , ( ) => {
46
+ const loaderService = new NgxUiLoaderService ( { minTime : MIN_TIME } ) ;
47
+ expect ( loaderService . getDefaultConfig ( ) ) . toEqual ( { ...DEFAULT_CONFIG , minTime : MIN_TIME } ) ;
48
+ } ) ;
49
+
50
+ it ( `NgxUiLoaderService({ minTime: ${ MIN_TIME + 1 } }) should return minTime: ${ MIN_TIME + 1 } ` , ( ) => {
51
+ const loaderService = new NgxUiLoaderService ( { minTime : MIN_TIME + 1 } ) ;
52
+ expect ( loaderService . getDefaultConfig ( ) ) . toEqual ( { ...DEFAULT_CONFIG , minTime : MIN_TIME + 1 } ) ;
44
53
} ) ;
45
54
} ) ;
46
55
@@ -643,8 +652,8 @@ describe(`NgxUiLoaderService (loaderId == ${DEFAULT_MASTER_LOADER_ID})`, () => {
643
652
loaderService . startLoader ( DEFAULT_MASTER_LOADER_ID ) ;
644
653
setTimeout ( ( ) => {
645
654
loaderService . stopLoader ( DEFAULT_MASTER_LOADER_ID ) ;
646
- } , MIN_TIME - 1 ) ;
647
- tick ( MIN_TIME - 1 ) ;
655
+ } , DEFAULT_CONFIG . minTime - 1 ) ;
656
+ tick ( DEFAULT_CONFIG . minTime - 1 ) ;
648
657
expect ( loaderService . hasRunningTask ( FOREGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_FG_TASK_ID ) ) . toEqual ( true ) ;
649
658
tick ( 1 ) ;
650
659
expect ( loaderService . hasRunningTask ( FOREGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_FG_TASK_ID ) ) . toEqual ( false ) ;
@@ -660,8 +669,8 @@ describe(`NgxUiLoaderService (loaderId == ${DEFAULT_MASTER_LOADER_ID})`, () => {
660
669
loaderService . startLoader ( DEFAULT_MASTER_LOADER_ID ) ;
661
670
setTimeout ( ( ) => {
662
671
loaderService . stopLoader ( DEFAULT_MASTER_LOADER_ID ) ;
663
- } , MIN_TIME - 1 ) ;
664
- tick ( MIN_TIME - 1 ) ;
672
+ } , DEFAULT_CONFIG . minTime - 1 ) ;
673
+ tick ( DEFAULT_CONFIG . minTime - 1 ) ;
665
674
expect ( loaderService . hasRunningTask ( FOREGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_FG_TASK_ID ) ) . toEqual ( true ) ;
666
675
tick ( 1 ) ;
667
676
expect ( loaderService . hasRunningTask ( FOREGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_FG_TASK_ID ) ) . toEqual ( false ) ;
@@ -681,8 +690,8 @@ describe(`NgxUiLoaderService (loaderId == ${DEFAULT_MASTER_LOADER_ID})`, () => {
681
690
loaderService . startLoader ( DEFAULT_MASTER_LOADER_ID ) ;
682
691
setTimeout ( ( ) => {
683
692
loaderService . stopLoader ( DEFAULT_MASTER_LOADER_ID ) ;
684
- } , MIN_TIME - 1 ) ;
685
- tick ( MIN_TIME - 1 ) ;
693
+ } , DEFAULT_CONFIG . minTime - 1 ) ;
694
+ tick ( DEFAULT_CONFIG . minTime - 1 ) ;
686
695
expect ( loaderService . hasRunningTask ( FOREGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_FG_TASK_ID ) ) . toEqual ( true ) ;
687
696
tick ( 1 ) ;
688
697
expect ( loaderService . hasRunningTask ( FOREGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_FG_TASK_ID ) ) . toEqual ( false ) ;
@@ -712,8 +721,8 @@ describe(`NgxUiLoaderService (loaderId == ${DEFAULT_MASTER_LOADER_ID})`, () => {
712
721
loaderService . start ( ) ;
713
722
setTimeout ( ( ) => {
714
723
loaderService . stop ( ) ;
715
- } , MIN_TIME - 1 ) ;
716
- tick ( MIN_TIME - 1 ) ;
724
+ } , DEFAULT_CONFIG . minTime - 1 ) ;
725
+ tick ( DEFAULT_CONFIG . minTime - 1 ) ;
717
726
expect ( loaderService . hasRunningTask ( FOREGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_FG_TASK_ID ) ) . toEqual ( true ) ;
718
727
tick ( 1 ) ;
719
728
expect ( loaderService . hasRunningTask ( FOREGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_FG_TASK_ID ) ) . toEqual ( false ) ;
@@ -740,8 +749,8 @@ describe(`NgxUiLoaderService (loaderId == ${DEFAULT_MASTER_LOADER_ID})`, () => {
740
749
loaderService . startBackgroundLoader ( DEFAULT_MASTER_LOADER_ID ) ;
741
750
setTimeout ( ( ) => {
742
751
loaderService . stopBackgroundLoader ( DEFAULT_MASTER_LOADER_ID ) ;
743
- } , MIN_TIME - 1 ) ;
744
- tick ( MIN_TIME - 1 ) ;
752
+ } , DEFAULT_CONFIG . minTime - 1 ) ;
753
+ tick ( DEFAULT_CONFIG . minTime - 1 ) ;
745
754
expect ( loaderService . hasRunningTask ( BACKGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_BG_TASK_ID ) ) . toEqual ( true ) ;
746
755
tick ( 1 ) ;
747
756
expect ( loaderService . hasRunningTask ( BACKGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_BG_TASK_ID ) ) . toEqual ( false ) ;
@@ -757,8 +766,8 @@ describe(`NgxUiLoaderService (loaderId == ${DEFAULT_MASTER_LOADER_ID})`, () => {
757
766
loaderService . startBackgroundLoader ( DEFAULT_MASTER_LOADER_ID ) ;
758
767
setTimeout ( ( ) => {
759
768
loaderService . stopBackgroundLoader ( DEFAULT_MASTER_LOADER_ID ) ;
760
- } , MIN_TIME - 1 ) ;
761
- tick ( MIN_TIME - 1 ) ;
769
+ } , DEFAULT_CONFIG . minTime - 1 ) ;
770
+ tick ( DEFAULT_CONFIG . minTime - 1 ) ;
762
771
expect ( loaderService . hasRunningTask ( BACKGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_BG_TASK_ID ) ) . toEqual ( true ) ;
763
772
tick ( 1 ) ;
764
773
expect ( loaderService . hasRunningTask ( BACKGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_BG_TASK_ID ) ) . toEqual ( false ) ;
@@ -777,8 +786,8 @@ describe(`NgxUiLoaderService (loaderId == ${DEFAULT_MASTER_LOADER_ID})`, () => {
777
786
loaderService . startBackground ( ) ;
778
787
setTimeout ( ( ) => {
779
788
loaderService . stopBackground ( ) ;
780
- } , MIN_TIME - 1 ) ;
781
- tick ( MIN_TIME - 1 ) ;
789
+ } , DEFAULT_CONFIG . minTime - 1 ) ;
790
+ tick ( DEFAULT_CONFIG . minTime - 1 ) ;
782
791
expect ( loaderService . hasRunningTask ( BACKGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_BG_TASK_ID ) ) . toEqual ( true ) ;
783
792
tick ( 1 ) ;
784
793
expect ( loaderService . hasRunningTask ( BACKGROUND , DEFAULT_MASTER_LOADER_ID , DEFAULT_BG_TASK_ID ) ) . toEqual ( false ) ;
@@ -892,7 +901,9 @@ describe(`NgxUiLoaderService (loaderId == ${DEFAULT_MASTER_LOADER_ID})`, () => {
892
901
loaderService = new NgxUiLoaderService ( { maxTime : MAX_TIME , delay : DELAY } ) ;
893
902
loaderService . bindLoaderData ( DEFAULT_MASTER_LOADER_ID ) ;
894
903
loaderService . start ( ) ;
895
- tick ( DELAY + MAX_TIME ) ;
904
+ tick ( DELAY + 10 ) ;
905
+ loaderService . start ( ) ;
906
+ tick ( MAX_TIME ) ;
896
907
loaderService . showForeground$ . subscribe ( data => {
897
908
expect ( data ) . toEqual ( { loaderId : DEFAULT_MASTER_LOADER_ID , isShow : false } ) ;
898
909
} ) ;
@@ -910,15 +921,15 @@ describe(`NgxUiLoaderService (loaderId == ${DEFAULT_MASTER_LOADER_ID})`, () => {
910
921
it ( `#Stop automatically due to timeout('${ DEFAULT_MASTER_LOADER_ID } ') - 2 - should work correctly` , fakeAsync ( ( ) => {
911
922
loaderService = new NgxUiLoaderService ( { maxTime : MAX_TIME , delay : DELAY } ) ;
912
923
loaderService . bindLoaderData ( DEFAULT_MASTER_LOADER_ID ) ;
913
- loaderService . start ( DEFAULT_FG_TASK_ID , { maxTime : MAX_TIME - 20 , delay : DELAY - 20 , minTime : MIN_TIME - 20 } ) ;
924
+ loaderService . start ( DEFAULT_FG_TASK_ID , { maxTime : MAX_TIME - 20 , delay : DELAY - 20 , minTime : DEFAULT_CONFIG . minTime - 20 } ) ;
914
925
tick ( DELAY + MAX_TIME - 20 ) ;
915
926
loaderService . showForeground$ . subscribe ( data => {
916
927
expect ( data ) . toEqual ( { loaderId : DEFAULT_MASTER_LOADER_ID , isShow : false } ) ;
917
928
} ) ;
918
929
loaderService . startBackground ( DEFAULT_FG_TASK_ID , {
919
930
maxTime : MAX_TIME - 30 ,
920
931
delay : DELAY - 30 ,
921
- minTime : MIN_TIME - 30
932
+ minTime : DEFAULT_CONFIG . minTime - 30
922
933
} ) ;
923
934
tick ( DELAY + MAX_TIME - 30 ) ;
924
935
expect ( loaderService . getLoaders ( ) [ DEFAULT_MASTER_LOADER_ID ] ) . toEqual ( {
0 commit comments