Skip to content

Commit c49c918

Browse files
committed
fix(NavController): Remove NavController and Rename NavMock to NavController Mock
NavMock should have been NavControllerMock BREAKING CHANGE: NavMock has been removed and in it's place NavControllerMock should be used. stonelasley#18
1 parent 96824ed commit c49c918

File tree

4 files changed

+69
-95
lines changed

4 files changed

+69
-95
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ to be used in your tests it should be safe to pull into a project.
3030
- Popover
3131
- PopoverController
3232
- NavController
33-
- Nav
3433
- NavParams
3534
- StatusBar
3635
- Storage

src/angular/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {MenuControllerMock} from './menu-controller';
1616
import {ModalMock} from './modal';
1717
import {ModalControllerMock} from './modal-controller';
1818
import {NavControllerMock} from './nav-controller';
19-
import {NavMock} from './nav';
2019
import {NavParamsMock} from './nav-params';
2120
import {TabMock} from './tab';
2221
import {TabsMock} from './tabs';
@@ -48,7 +47,6 @@ export {
4847
ModalMock,
4948
ModalControllerMock,
5049
NavControllerMock,
51-
NavMock,
5250
NavParamsMock,
5351
TabMock,
5452
TabsMock,

src/angular/nav-controller.ts

Lines changed: 69 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,80 @@
1+
import {ViewControllerMock} from './view-controller';
2+
13
export class NavControllerMock {
24
public static instance(): any {
3-
4-
let instance = jasmine.createSpyObj('navController', [
5+
let instance: any = jasmine.createSpyObj('NavController', [
6+
'goToRoot',
7+
'initPane',
8+
'pangeChanged',
59
'push',
10+
'insert',
11+
'insertPage',
612
'pop',
7-
'ionViewDidLoad',
8-
'ionViewWillEnter',
9-
'ionViewDidEnter',
10-
'ionViewWillLeave',
11-
'ionViewWillUnload',
12-
'ionViewCanEnter',
13-
'ionViewCanLeave'
13+
'popTo',
14+
'popToRoot',
15+
'popAll',
16+
'remove',
17+
'removeView',
18+
'setRoot',
19+
'setPages',
20+
'hasChildren',
21+
'getActiveChildNav',
22+
'registerChildNav',
23+
'unregisterChildNav',
24+
'destroy',
25+
'swipeBackStart',
26+
'swipeBackProgress',
27+
'swipeBackEnd',
28+
'canSwipeBack',
29+
'canGoBack',
30+
'isTransitioning',
31+
'setTransitioning',
32+
'getActive',
33+
'isActive',
34+
'getByIndex',
35+
'getPrevious',
36+
'first',
37+
'last',
38+
'indexOf',
39+
'length',
40+
'getViews',
41+
'isSwipeBackEnabled',
42+
'dismissPageChangeViews',
43+
'setViewPort',
44+
'resize'
1445
]);
1546

47+
instance.goToRoot.and.returnValue(Promise.resolve());
48+
instance.initPane.and.returnValue(1);
49+
50+
instance['root'] = ViewControllerMock.instance();
51+
instance['rootParams'] = {};
52+
1653
instance.push.and.returnValue(Promise.resolve());
54+
instance.insert.and.returnValue(Promise.resolve());
55+
instance.insertPage.and.returnValue(Promise.resolve());
1756
instance.pop.and.returnValue(Promise.resolve());
18-
instance.ionViewCanEnter.and.returnValue(true);
19-
instance.ionViewCanLeave.and.returnValue(true);
57+
instance.popTo.and.returnValue(Promise.resolve());
58+
instance.popToRoot.and.returnValue(Promise.resolve());
59+
instance.popAll.and.returnValue(Promise.resolve());
60+
instance.remove.and.returnValue(Promise.resolve());
61+
instance.removeView.and.returnValue(Promise.resolve());
62+
instance.setRoot.and.returnValue(Promise.resolve());
63+
instance.setPages.and.returnValue(Promise.resolve());
64+
instance.hasChildren.and.returnValue(true);
65+
instance.canSwipeBack.and.returnValue(true);
66+
instance.canGoBack.and.returnValue(true);
67+
instance.isTransitioning.and.returnValue(false);
68+
instance.getActive.and.returnValue(ViewControllerMock.instance());
69+
instance.isActive.and.returnValue(true);
70+
instance.getByIndex.and.returnValue(ViewControllerMock.instance());
71+
instance.getPrevious.and.returnValue(ViewControllerMock.instance());
72+
instance.first.and.returnValue(ViewControllerMock.instance());
73+
instance.last.and.returnValue(ViewControllerMock.instance());
74+
instance.indexOf.and.returnValue(0);
75+
instance.length.and.returnValue(0);
76+
instance.getViews.and.returnValue([]);
77+
instance.isSwipeBackEnabled.and.returnValue(true);
2078

2179
return instance;
2280
}

src/angular/nav.ts

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)