1
1
import { TestBed } from '@angular/core/testing' ;
2
- import { Router , RouterEvent , NavigationEnd } from '@angular/router' ;
2
+ import { NavigationEnd , Router , RouterEvent } from '@angular/router' ;
3
3
import {
4
+ FullRouterStateSerializer ,
5
+ MinimalRouterStateSerializer ,
6
+ RouterAction ,
4
7
routerReducer ,
5
8
RouterReducerState ,
6
- StoreRouterConnectingModule ,
7
- RouterAction ,
8
9
RouterState ,
9
10
RouterStateSerializer ,
10
- MinimalRouterStateSerializer ,
11
- FullRouterStateSerializer ,
12
11
} from '@ngrx/router-store' ;
13
- import { select , Store , ActionsSubject } from '@ngrx/store' ;
14
- import { withLatestFrom , filter , skip } from 'rxjs/operators' ;
12
+ import { ActionsSubject , select , Store } from '@ngrx/store' ;
13
+ import { filter , withLatestFrom } from 'rxjs/operators' ;
15
14
16
15
import { createTestModule } from './utils' ;
16
+ import { StoreRouterConnectingService } from '../src/store_router_connecting.service' ;
17
17
18
18
describe ( 'Router Store Module' , ( ) => {
19
19
describe ( 'with defining state key' , ( ) => {
20
20
const customStateKey = 'router-reducer' ;
21
- let storeRouterConnectingModule : StoreRouterConnectingModule ;
21
+ let storeRouterConnectingService : StoreRouterConnectingService ;
22
22
let store : Store < State > ;
23
23
let router : Router ;
24
24
@@ -38,11 +38,13 @@ describe('Router Store Module', () => {
38
38
39
39
store = TestBed . inject ( Store ) ;
40
40
router = TestBed . inject ( Router ) ;
41
- storeRouterConnectingModule = TestBed . inject ( StoreRouterConnectingModule ) ;
41
+ storeRouterConnectingService = TestBed . inject (
42
+ StoreRouterConnectingService
43
+ ) ;
42
44
} ) ;
43
45
44
46
it ( 'should have custom state key as own property' , ( ) => {
45
- expect ( ( < any > storeRouterConnectingModule ) . stateKey ) . toBe ( customStateKey ) ;
47
+ expect ( ( < any > storeRouterConnectingService ) . stateKey ) . toBe ( customStateKey ) ;
46
48
} ) ;
47
49
48
50
it ( 'should call navigateIfNeeded with args selected by custom state key' , ( done : any ) => {
@@ -54,7 +56,7 @@ describe('Router Store Module', () => {
54
56
} ) ;
55
57
56
58
spyOn (
57
- storeRouterConnectingModule ,
59
+ storeRouterConnectingService ,
58
60
'navigateIfNeeded' as never
59
61
) . and . callThrough ( ) ;
60
62
logs = [ ] ;
@@ -63,7 +65,7 @@ describe('Router Store Module', () => {
63
65
// and store emits its payload.
64
66
router . navigateByUrl ( '/' ) . then ( ( ) => {
65
67
const actual = ( < any > (
66
- storeRouterConnectingModule
68
+ storeRouterConnectingService
67
69
) ) . navigateIfNeeded . calls . allArgs ( ) ;
68
70
69
71
expect ( actual . length ) . toBe ( 1 ) ;
@@ -77,7 +79,7 @@ describe('Router Store Module', () => {
77
79
const customStateKey = 'routerReducer' ;
78
80
const customStateSelector = ( state : State ) => state . routerReducer ;
79
81
80
- let storeRouterConnectingModule : StoreRouterConnectingModule ;
82
+ let storeRouterConnectingService : StoreRouterConnectingService ;
81
83
let store : Store < State > ;
82
84
let router : Router ;
83
85
@@ -97,11 +99,13 @@ describe('Router Store Module', () => {
97
99
98
100
store = TestBed . inject ( Store ) ;
99
101
router = TestBed . inject ( Router ) ;
100
- storeRouterConnectingModule = TestBed . inject ( StoreRouterConnectingModule ) ;
102
+ storeRouterConnectingService = TestBed . inject (
103
+ StoreRouterConnectingService
104
+ ) ;
101
105
} ) ;
102
106
103
107
it ( 'should have same state selector as own property' , ( ) => {
104
- expect ( ( < any > storeRouterConnectingModule ) . stateKey ) . toBe (
108
+ expect ( ( < any > storeRouterConnectingService ) . stateKey ) . toBe (
105
109
customStateSelector
106
110
) ;
107
111
} ) ;
@@ -115,7 +119,7 @@ describe('Router Store Module', () => {
115
119
} ) ;
116
120
117
121
spyOn (
118
- storeRouterConnectingModule ,
122
+ storeRouterConnectingService ,
119
123
'navigateIfNeeded' as never
120
124
) . and . callThrough ( ) ;
121
125
logs = [ ] ;
@@ -124,7 +128,7 @@ describe('Router Store Module', () => {
124
128
// and store emits its payload.
125
129
router . navigateByUrl ( '/' ) . then ( ( ) => {
126
130
const actual = ( < any > (
127
- storeRouterConnectingModule
131
+ storeRouterConnectingService
128
132
) ) . navigateIfNeeded . calls . allArgs ( ) ;
129
133
130
134
expect ( actual . length ) . toBe ( 1 ) ;
0 commit comments