@@ -23,7 +23,7 @@ describe('NavController', () => {
23
23
const hasCompleted = true ;
24
24
const requiresTransition = true ;
25
25
expect ( push1Done ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view1 , undefined , 'forward' ) ;
26
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
26
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
27
27
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
28
28
29
29
// Push 2
@@ -32,7 +32,7 @@ describe('NavController', () => {
32
32
33
33
expect ( push2Done ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view2 , view1 , 'forward' ) ;
34
34
35
- expect ( nav . getLength ( ) ) . toEqual ( 2 ) ;
35
+ expect ( await nav . getLength ( ) ) . toEqual ( 2 ) ;
36
36
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
37
37
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView2 ) ;
38
38
@@ -41,7 +41,7 @@ describe('NavController', () => {
41
41
await nav . push ( view3 , null , { animated : false } , push3Done ) ;
42
42
43
43
expect ( push3Done ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view3 , view2 , 'forward' ) ;
44
- expect ( nav . getLength ( ) ) . toEqual ( 3 ) ;
44
+ expect ( await nav . getLength ( ) ) . toEqual ( 3 ) ;
45
45
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
46
46
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView2 ) ;
47
47
expect ( nav [ 'views' ] [ 2 ] . component ) . toEqual ( MockView3 ) ;
@@ -50,7 +50,7 @@ describe('NavController', () => {
50
50
const view4 = mockView ( MockView4 ) ;
51
51
await nav . push ( view4 , null , { animated : false } , push4Done ) ;
52
52
expect ( push4Done ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view4 , view3 , 'forward' ) ;
53
- expect ( nav . getLength ( ) ) . toEqual ( 4 ) ;
53
+ expect ( await nav . getLength ( ) ) . toEqual ( 4 ) ;
54
54
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
55
55
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView2 ) ;
56
56
expect ( nav [ 'views' ] [ 2 ] . component ) . toEqual ( MockView3 ) ;
@@ -59,22 +59,22 @@ describe('NavController', () => {
59
59
// Pop 1
60
60
await nav . pop ( { animated : false } , pop1Done ) ;
61
61
expect ( pop1Done ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view3 , view4 , 'back' ) ;
62
- expect ( nav . getLength ( ) ) . toEqual ( 3 ) ;
62
+ expect ( await nav . getLength ( ) ) . toEqual ( 3 ) ;
63
63
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
64
64
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView2 ) ;
65
65
expect ( nav [ 'views' ] [ 2 ] . component ) . toEqual ( MockView3 ) ;
66
66
67
67
// Pop 2
68
68
await nav . pop ( { animated : false } , pop2Done ) ;
69
69
expect ( pop2Done ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view2 , view3 , 'back' ) ;
70
- expect ( nav . getLength ( ) ) . toEqual ( 2 ) ;
70
+ expect ( await nav . getLength ( ) ) . toEqual ( 2 ) ;
71
71
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
72
72
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView2 ) ;
73
73
74
74
// Pop 3
75
75
await nav . pop ( { animated : false } , pop3Done ) ;
76
76
expect ( pop3Done ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view1 , view2 , 'back' ) ;
77
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
77
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
78
78
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
79
79
} , 10000 ) ;
80
80
} ) ;
@@ -86,7 +86,7 @@ describe('NavController', () => {
86
86
const hasCompleted = true ;
87
87
const requiresTransition = true ;
88
88
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view1 , undefined , 'forward' ) ;
89
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
89
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
90
90
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
91
91
expect ( nav [ 'isTransitioning' ] ) . toEqual ( false ) ;
92
92
} , 10000 ) ;
@@ -102,7 +102,7 @@ describe('NavController', () => {
102
102
const hasCompleted = true ;
103
103
const requiresTransition = true ;
104
104
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view2 , view1 , 'forward' ) ;
105
- expect ( nav . getLength ( ) ) . toEqual ( 2 ) ;
105
+ expect ( await nav . getLength ( ) ) . toEqual ( 2 ) ;
106
106
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
107
107
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView2 ) ;
108
108
expect ( nav [ 'isTransitioning' ] ) . toEqual ( false ) ;
@@ -134,7 +134,7 @@ describe('NavController', () => {
134
134
const hasCompleted = true ;
135
135
const requiresTransition = true ;
136
136
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view2 , view1 , 'forward' ) ;
137
- expect ( nav . getLength ( ) ) . toEqual ( 2 ) ;
137
+ expect ( await nav . getLength ( ) ) . toEqual ( 2 ) ;
138
138
} , 10000 ) ;
139
139
} ) ;
140
140
@@ -156,9 +156,9 @@ describe('NavController', () => {
156
156
const hasCompleted = true ;
157
157
const requiresTransition = false ;
158
158
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , undefined , undefined , undefined ) ;
159
- expect ( nav . getLength ( ) ) . toEqual ( 4 ) ;
159
+ expect ( await nav . getLength ( ) ) . toEqual ( 4 ) ;
160
160
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView4 ) ;
161
- expect ( nav [ 'views' ] [ nav . getLength ( ) - 1 ] . component ) . toEqual ( MockView3 ) ;
161
+ expect ( nav [ 'views' ] [ ( await nav . getLength ( ) ) - 1 ] . component ) . toEqual ( MockView3 ) ;
162
162
} , 10000 ) ;
163
163
164
164
it ( 'should insert at the end when given -1' , async ( ) => {
@@ -172,8 +172,8 @@ describe('NavController', () => {
172
172
const hasCompleted = true ;
173
173
const requiresTransition = true ;
174
174
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view2 , view1 , 'forward' ) ;
175
- expect ( nav . getLength ( ) ) . toEqual ( 2 ) ;
176
- expect ( nav [ 'views' ] [ nav . getLength ( ) - 1 ] . component ) . toEqual ( MockView2 ) ;
175
+ expect ( await nav . getLength ( ) ) . toEqual ( 2 ) ;
176
+ expect ( nav [ 'views' ] [ ( await nav . getLength ( ) ) - 1 ] . component ) . toEqual ( MockView2 ) ;
177
177
} , 10000 ) ;
178
178
179
179
it ( 'should insert at the end when given a number greater than actual length' , async ( ) => {
@@ -185,8 +185,8 @@ describe('NavController', () => {
185
185
const hasCompleted = true ;
186
186
const requiresTransition = true ;
187
187
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view2 , view1 , 'forward' ) ;
188
- expect ( nav . getLength ( ) ) . toEqual ( 2 ) ;
189
- expect ( nav [ 'views' ] [ nav . getLength ( ) - 1 ] . component ) . toEqual ( MockView2 ) ;
188
+ expect ( await nav . getLength ( ) ) . toEqual ( 2 ) ;
189
+ expect ( nav [ 'views' ] [ ( await nav . getLength ( ) ) - 1 ] . component ) . toEqual ( MockView2 ) ;
190
190
} , 10000 ) ;
191
191
192
192
it ( 'should not insert if null view' , ( done ) => {
@@ -197,14 +197,14 @@ describe('NavController', () => {
197
197
. then ( ( ) => {
198
198
fail ( 'it should not succeed' ) ;
199
199
} )
200
- . catch ( ( err : Error ) => {
200
+ . catch ( async ( err : Error ) => {
201
201
const hasCompleted = false ;
202
202
const requiresTransition = false ;
203
203
const rejectReason = new Error ( 'invalid views to insert' ) ;
204
204
expect ( err ) . toEqual ( rejectReason ) ;
205
205
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , rejectReason ) ;
206
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
207
- expect ( nav [ 'views' ] [ nav . getLength ( ) - 1 ] . component ) . toEqual ( MockView1 ) ;
206
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
207
+ expect ( nav [ 'views' ] [ ( await nav . getLength ( ) ) - 1 ] . component ) . toEqual ( MockView1 ) ;
208
208
done ( ) ;
209
209
} ) ;
210
210
} , 10000 ) ;
@@ -232,7 +232,7 @@ describe('NavController', () => {
232
232
const hasCompleted = true ;
233
233
const requiresTransition = false ;
234
234
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , undefined , undefined , undefined ) ;
235
- expect ( nav . getLength ( ) ) . toEqual ( 5 ) ;
235
+ expect ( await nav . getLength ( ) ) . toEqual ( 5 ) ;
236
236
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
237
237
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView4 ) ;
238
238
expect ( nav [ 'views' ] [ 2 ] . component ) . toEqual ( MockView5 ) ;
@@ -251,13 +251,13 @@ describe('NavController', () => {
251
251
. then ( ( ) => {
252
252
fail ( 'it should not succeed' ) ;
253
253
} )
254
- . catch ( ( err : any ) => {
254
+ . catch ( async ( err : any ) => {
255
255
const hasCompleted = false ;
256
256
const requiresTransition = false ;
257
257
const rejectReason = new Error ( 'no views in the stack to be removed' ) ;
258
258
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , rejectReason ) ;
259
259
expect ( err ) . toEqual ( rejectReason ) ;
260
- expect ( nav . getLength ( ) ) . toEqual ( 0 ) ;
260
+ expect ( await nav . getLength ( ) ) . toEqual ( 0 ) ;
261
261
expect ( nav [ 'isTransitioning' ] ) . toEqual ( false ) ;
262
262
done ( ) ;
263
263
} ) ;
@@ -287,7 +287,7 @@ describe('NavController', () => {
287
287
const hasCompleted = true ;
288
288
const requiresTransition = true ;
289
289
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view1 , view2 , 'back' ) ;
290
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
290
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
291
291
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
292
292
expect ( nav [ 'isTransitioning' ] ) . toEqual ( false ) ;
293
293
} , 10000 ) ;
@@ -305,7 +305,7 @@ describe('NavController', () => {
305
305
const hasCompleted = true ;
306
306
const requiresTransition = true ;
307
307
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view2 , view3 , 'back' ) ;
308
- expect ( nav . getLength ( ) ) . toEqual ( 2 ) ;
308
+ expect ( await nav . getLength ( ) ) . toEqual ( 2 ) ;
309
309
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
310
310
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView2 ) ;
311
311
} , 10000 ) ;
@@ -322,7 +322,7 @@ describe('NavController', () => {
322
322
const hasCompleted = true ;
323
323
const requiresTransition = true ;
324
324
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view2 , view4 , 'back' ) ;
325
- expect ( nav . getLength ( ) ) . toEqual ( 2 ) ;
325
+ expect ( await nav . getLength ( ) ) . toEqual ( 2 ) ;
326
326
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
327
327
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView2 ) ;
328
328
} , 10000 ) ;
@@ -368,7 +368,7 @@ describe('NavController', () => {
368
368
const hasCompleted = true ;
369
369
const requiresTransition = true ;
370
370
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view1 , view4 , 'back' ) ;
371
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
371
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
372
372
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
373
373
} , 10000 ) ;
374
374
} ) ;
@@ -415,7 +415,7 @@ describe('NavController', () => {
415
415
const hasCompleted = true ;
416
416
const requiresTransition = true ;
417
417
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view1 , view4 , 'back' ) ;
418
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
418
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
419
419
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
420
420
} , 10000 ) ;
421
421
@@ -427,7 +427,7 @@ describe('NavController', () => {
427
427
const hasCompleted = true ;
428
428
const requiresTransition = false ;
429
429
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , undefined , undefined , undefined ) ;
430
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
430
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
431
431
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
432
432
} , 10000 ) ;
433
433
} ) ;
@@ -474,7 +474,7 @@ describe('NavController', () => {
474
474
const hasCompleted = true ;
475
475
const requiresTransition = false ;
476
476
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , undefined , undefined , undefined ) ;
477
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
477
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
478
478
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView4 ) ;
479
479
} , 10000 ) ;
480
480
@@ -527,7 +527,7 @@ describe('NavController', () => {
527
527
const hasCompleted = true ;
528
528
const requiresTransition = false ;
529
529
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , undefined , undefined , undefined ) ;
530
- expect ( nav . getLength ( ) ) . toEqual ( 3 ) ;
530
+ expect ( await nav . getLength ( ) ) . toEqual ( 3 ) ;
531
531
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
532
532
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView2 ) ;
533
533
expect ( nav [ 'views' ] [ 2 ] . component ) . toEqual ( MockView5 ) ;
@@ -574,7 +574,7 @@ describe('NavController', () => {
574
574
const hasCompleted = true ;
575
575
const requiresTransition = true ;
576
576
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view2 , view4 , 'back' ) ;
577
- expect ( nav . getLength ( ) ) . toEqual ( 2 ) ;
577
+ expect ( await nav . getLength ( ) ) . toEqual ( 2 ) ;
578
578
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
579
579
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView2 ) ;
580
580
} , 10000 ) ;
@@ -613,7 +613,7 @@ describe('NavController', () => {
613
613
const hasCompleted = true ;
614
614
const requiresTransition = false ;
615
615
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , undefined , undefined , undefined ) ;
616
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
616
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
617
617
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView3 ) ;
618
618
} , 10000 ) ;
619
619
@@ -649,7 +649,7 @@ describe('NavController', () => {
649
649
const hasCompleted = true ;
650
650
const requiresTransition = true ;
651
651
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view2 , view3 , 'back' ) ;
652
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
652
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
653
653
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView2 ) ;
654
654
} , 10000 ) ;
655
655
@@ -685,7 +685,7 @@ describe('NavController', () => {
685
685
const hasCompleted = true ;
686
686
const requiresTransition = true ;
687
687
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view1 , view3 , 'back' ) ;
688
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
688
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
689
689
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView1 ) ;
690
690
} , 10000 ) ;
691
691
@@ -708,7 +708,7 @@ describe('NavController', () => {
708
708
const hasCompleted = true ;
709
709
const requiresTransition = true ;
710
710
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view4 , view3 , 'back' ) ;
711
- expect ( nav . getLength ( ) ) . toEqual ( 1 ) ;
711
+ expect ( await nav . getLength ( ) ) . toEqual ( 1 ) ;
712
712
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView4 ) ;
713
713
} , 10000 ) ;
714
714
} ) ;
@@ -732,7 +732,7 @@ describe('NavController', () => {
732
732
const hasCompleted = true ;
733
733
const requiresTransition = true ;
734
734
expect ( trnsDone ) . toHaveBeenCalledWith ( hasCompleted , requiresTransition , view5 , view2 , 'back' ) ;
735
- expect ( nav . getLength ( ) ) . toEqual ( 2 ) ;
735
+ expect ( await nav . getLength ( ) ) . toEqual ( 2 ) ;
736
736
expect ( nav [ 'views' ] [ 0 ] . component ) . toEqual ( MockView4 ) ;
737
737
expect ( nav [ 'views' ] [ 1 ] . component ) . toEqual ( MockView5 ) ;
738
738
} , 10000 ) ;
0 commit comments