Skip to content

Commit 8b2f691

Browse files
author
Stone Lasley
authored
Merge branch 'master' into master
2 parents 9881d5c + deb43bc commit 8b2f691

File tree

8 files changed

+60
-59
lines changed

8 files changed

+60
-59
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ionic-mocks",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"description": "Stubbed and Pre-mocked Ionic2+ Objects",
55
"repository": "git@github.com:stonelasley/ionic-mocks.git",
66
"main": "./dist/index.js",

‎src/angular/app.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { createSpyObj } from '../utilities/create-spy';
2-
import { Observable } from 'rxjs';
3-
import {NavControllerMock} from './nav-controller';
1+
import {createSpyObj} from '../utilities/create-spy';
2+
import {Observable} from 'rxjs/Observable';
3+
import {ArrayObservable} from 'rxjs/observable/ArrayObservable';
4+
import {NavControllerMock} from './nav-controller';
45

56
export class AppMock {
67
public static instance(navCtrl?: NavControllerMock, viewObservable?: Observable<any>): any {
@@ -20,12 +21,12 @@ export class AppMock {
2021

2122
instance.getRootNav.and.returnValue(navCtrl || NavControllerMock.instance());
2223
instance.isScrolling.and.returnValue(false);
23-
instance.viewDidEnter.and.returnValue(viewObservable || Observable.of(undefined));
24-
instance.viewDidLoad.and.returnValue(viewObservable || Observable.of(undefined));
25-
instance.viewDidLeave.and.returnValue(viewObservable || Observable.of(undefined));
26-
instance.viewWillEnter.and.returnValue(viewObservable || Observable.of(undefined));
27-
instance.viewWillUnload.and.returnValue(viewObservable || Observable.of(undefined));
28-
instance.viewWillLeave.and.returnValue(viewObservable || Observable.of(undefined));
24+
instance.viewDidEnter.and.returnValue(viewObservable || ArrayObservable.of(undefined));
25+
instance.viewDidLoad.and.returnValue(viewObservable || ArrayObservable.of(undefined));
26+
instance.viewDidLeave.and.returnValue(viewObservable || ArrayObservable.of(undefined));
27+
instance.viewWillEnter.and.returnValue(viewObservable || ArrayObservable.of(undefined));
28+
instance.viewWillUnload.and.returnValue(viewObservable || ArrayObservable.of(undefined));
29+
instance.viewWillLeave.and.returnValue(viewObservable || ArrayObservable.of(undefined));
2930

3031
return instance;
3132
}

‎src/angular/nav-controller.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { createSpyObj } from '../utilities/create-spy';
2-
import { Observable } from 'rxjs/Observable';
1+
import { ArrayObservable } from 'rxjs/observable/ArrayObservable';
32
import { ViewControllerMock } from './view-controller';
43

54
export class NavControllerMock {
@@ -85,12 +84,12 @@ export class NavControllerMock {
8584
instance.length.and.returnValue(0);
8685
instance.getViews.and.returnValue([]);
8786
instance.isSwipeBackEnabled.and.returnValue(true);
88-
instance.viewDidEnter = Observable.of();
89-
instance.viewDidLeave = Observable.of();
90-
instance.viewDidLoad = Observable.of();
91-
instance.viewWillEnter = Observable.of();
92-
instance.viewWillLeave = Observable.of();
93-
instance.viewWillUnload = Observable.of();
87+
instance.viewDidEnter = ArrayObservable.of();
88+
instance.viewDidLeave = ArrayObservable.of();
89+
instance.viewDidLoad = ArrayObservable.of();
90+
instance.viewWillEnter = ArrayObservable.of();
91+
instance.viewWillLeave = ArrayObservable.of();
92+
instance.viewWillUnload = ArrayObservable.of();
9493

9594
return instance;
9695
}

‎src/angular/view-controller.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Observable } from 'rxjs';
2-
import { NavParamsMock } from './nav-params';
3-
import { NavControllerMock } from './nav-controller';
41
import { createSpyObj } from '../utilities/create-spy';
2+
import { ArrayObservable } from 'rxjs/observable/ArrayObservable';
3+
import { NavParamsMock } from './nav-params';
4+
import { NavControllerMock } from './nav-controller';
55

66
export class ViewControllerMock {
77
private static staticInstance: any = null;
@@ -87,12 +87,12 @@ export class ViewControllerMock {
8787
instance.length.and.returnValue(0);
8888
instance.getViews.and.returnValue([]);
8989
instance.isSwipeBackEnabled.and.returnValue(true);
90-
instance.viewDidEnter = Observable.of();
91-
instance.viewDidLeave = Observable.of();
92-
instance.viewDidLoad = Observable.of();
93-
instance.viewWillEnter = Observable.of();
94-
instance.viewWillLeave = Observable.of();
95-
instance.viewWillUnload = Observable.of();
90+
instance.viewDidEnter = ArrayObservable.of();
91+
instance.viewDidLeave = ArrayObservable.of();
92+
instance.viewDidLoad = ArrayObservable.of();
93+
instance.viewWillEnter = ArrayObservable.of();
94+
instance.viewWillLeave = ArrayObservable.of();
95+
instance.viewWillUnload = ArrayObservable.of();
9696
}
9797

9898
public static instance(): any {
@@ -133,12 +133,12 @@ export class ViewControllerMock {
133133
'_setIONContentRef'
134134
]);
135135

136-
instance.willEnter.and.returnValue(Observable.of({}));
137-
instance.didEnter.and.returnValue(Observable.of({}));
138-
instance.willLeave.and.returnValue(Observable.of({}));
139-
instance.didLeave.and.returnValue(Observable.of({}));
140-
instance.willUnload.and.returnValue(Observable.of({}));
141-
instance.didUnload.and.returnValue(Observable.of({}));
136+
instance.willEnter.and.returnValue(ArrayObservable.of({}));
137+
instance.didEnter.and.returnValue(ArrayObservable.of({}));
138+
instance.willLeave.and.returnValue(ArrayObservable.of({}));
139+
instance.didLeave.and.returnValue(ArrayObservable.of({}));
140+
instance.willUnload.and.returnValue(ArrayObservable.of({}));
141+
instance.didUnload.and.returnValue(ArrayObservable.of({}));
142142
instance.dismiss.and.returnValue(Promise.resolve());
143143
instance.onDidDismiss.and.returnValue(Promise.resolve());
144144
instance.onWillDismiss.and.returnValue(Promise.resolve());
@@ -150,7 +150,7 @@ export class ViewControllerMock {
150150
instance.contentRef.and.returnValue(Promise.resolve());
151151
instance.hasNavbar.and.returnValue(true);
152152
instance.index.and.returnValue(true);
153-
instance.subscribe.and.returnValue(Observable.of({}));
153+
instance.subscribe.and.returnValue(ArrayObservable.of({}));
154154
instance.getNav.and.returnValue({});
155155
instance.getIONContent.and.returnValue({});
156156

‎src/native/keyboard.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Observable } from 'rxjs/Observable';
21
import { createSpyObj } from '../utilities/create-spy';
2+
import {EmptyObservable} from 'rxjs/observable/EmptyObservable';
33

44
export class KeyboardMock {
55
public static instance(): any {
@@ -12,8 +12,8 @@ export class KeyboardMock {
1212
'onKeyboardHide'
1313
]);
1414

15-
instance.onKeyboardShow.and.returnValue(Observable.empty());
16-
instance.onKeyboardHide.and.returnValue(Observable.empty());
15+
instance.onKeyboardShow.and.returnValue(EmptyObservable.create());
16+
instance.onKeyboardHide.and.returnValue(EmptyObservable.create());
1717

1818
return instance;
1919
}

‎src/native/network.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
import { Observable } from 'rxjs/Observable';
21
import { createSpyObj } from '../utilities/create-spy';
2+
import { EmptyObservable } from 'rxjs/observable/EmptyObservable';
33

44
export class NetworkMock {
55
public static instance(networkType: string): any {
66
let instance = createSpyObj('Network', [
77
'type',
88
'downlinkMax',
9-
'onchange',
9+
'onChange',
1010
'onDisconnect',
1111
'onConnect',
1212
]);
1313
instance.type.and.returnValue(networkType || 'wifi');
1414
instance.downlinkMax.and.returnValue('42');
15-
instance.onChange.and.returnValue(Observable.empty());
16-
instance.onDisconnect.and.returnValue(Observable.empty());
17-
instance.onConnect.and.returnValue(Observable.empty());
15+
instance.onChange.and.returnValue(EmptyObservable.create());
16+
instance.onDisconnect.and.returnValue(EmptyObservable.create());
17+
instance.onConnect.and.returnValue(EmptyObservable.create());
1818
return instance;
1919
}
2020
}

‎src/native/nfc.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Observable } from 'rxjs/Observable';
21
import { createSpyObj } from '../utilities/create-spy';
2+
import { EmptyObservable } from 'rxjs/observable/EmptyObservable';
33

44
export class NFCMock {
55
public static instance(): any {
@@ -21,19 +21,19 @@ export class NFCMock {
2121
'stringToBytes',
2222
'bytesToHexString'
2323
]);
24-
instance.addNdefListener.and.returnValue(Observable.empty());
25-
instance.addTagDiscoveredListener.and.returnValue(Observable.empty());
26-
instance.addMimeTypeListener.and.returnValue(Observable.empty());
27-
instance.addNdefFormatableListener.and.returnValue(Observable.empty());
28-
instance.write.and.returnValue(Observable.empty());
29-
instance.makeReadyOnly.and.returnValue(Observable.empty());
30-
instance.share.and.returnValue(Observable.empty());
31-
instance.unshare.and.returnValue(Observable.empty());
32-
instance.erase.and.returnValue(Observable.empty());
33-
instance.handover.and.returnValue(Observable.empty());
34-
instance.stopHandover.and.returnValue(Observable.empty());
35-
instance.showSettings.and.returnValue(Observable.empty());
36-
instance.enabled.and.returnValue(Observable.empty());
24+
instance.addNdefListener.and.returnValue(EmptyObservable.create());
25+
instance.addTagDiscoveredListener.and.returnValue(EmptyObservable.create());
26+
instance.addMimeTypeListener.and.returnValue(EmptyObservable.create());
27+
instance.addNdefFormatableListener.and.returnValue(EmptyObservable.create());
28+
instance.write.and.returnValue(EmptyObservable.create());
29+
instance.makeReadyOnly.and.returnValue(EmptyObservable.create());
30+
instance.share.and.returnValue(EmptyObservable.create());
31+
instance.unshare.and.returnValue(EmptyObservable.create());
32+
instance.erase.and.returnValue(EmptyObservable.create());
33+
instance.handover.and.returnValue(EmptyObservable.create());
34+
instance.stopHandover.and.returnValue(EmptyObservable.create());
35+
instance.showSettings.and.returnValue(EmptyObservable.create());
36+
instance.enabled.and.returnValue(EmptyObservable.create());
3737
instance.bytesToString.and.returnValue('');
3838
instance.stringToBytes.and.returnValue([]);
3939
instance.bytesToHexString.and.returnValue('');

‎src/native/three-dee-touch.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { Observable } from 'rxjs/Observable';
21
import { createSpyObj } from '../utilities/create-spy';
2+
import { ArrayObservable } from 'rxjs/observable/ArrayObservable';
3+
import { EmptyObservable } from 'rxjs/observable/EmptyObservable';
34

45
export class ThreeDeeTouchMock {
56
public static instance(): any {
@@ -12,8 +13,8 @@ export class ThreeDeeTouchMock {
1213
'disableLinkPreview'
1314
]);
1415
instance.isAvailable.and.returnValue(Promise.resolve(true));
15-
instance.watchForTouches.and.returnValue(Observable.of({}));
16-
instance.onHomeIconPressed.and.returnValue(Observable.empty());
16+
instance.watchForTouches.and.returnValue(ArrayObservable.of({}));
17+
instance.onHomeIconPressed.and.returnValue(EmptyObservable.create());
1718

1819
return instance;
1920
}

0 commit comments

Comments
 (0)