Merge e526d0e into 1b1c286

stonelasley · Jan 25, 2019 · 3cdfc51 · 3cdfc51
2 parents 1b1c286 + e526d0e
commit 3cdfc51
Show file tree

Hide file tree

Showing 9 changed files with 276 additions and 186 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,9 +40,10 @@
     "karma-chrome-launcher": "^2.1.1",
     "karma-coveralls": "^1.2.1",
     "karma-jasmine": "^1.1.2",
-    "karma-typescript": "^3.0.3",
+    "karma-typescript": "^3.0.13",
     "rimraf": "^2.6.1",
-    "rxjs": "^5.4.2",
+    "rxjs": "^6.3.3",
+    "rxjs-compat": "^6.3.3",
     "semantic-release": "^15.6.3",
     "tslint": "^5.5.0",
     "tslint-ionic-rules": "0.0.11",

diff --git a/src/angular/app.ts b/src/angular/app.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 import { ArrayObservable } from 'rxjs/observable/ArrayObservable';
 import { NavControllerMock } from './nav-controller';
 import { BaseMock } from '../base.mock';
@@ -48,22 +48,22 @@ export class AppMock extends BaseMock {
         );
         this.spyObj.isScrolling.and.returnValue(false);
         this.spyObj.viewDidEnter.and.returnValue(
-            _viewObservable || ArrayObservable.of(undefined)
+            _viewObservable || of(undefined)
         );
         this.spyObj.viewDidLoad.and.returnValue(
-            _viewObservable || ArrayObservable.of(undefined)
+            _viewObservable || of(undefined)
         );
         this.spyObj.viewDidLeave.and.returnValue(
-            _viewObservable || ArrayObservable.of(undefined)
+            _viewObservable || of(undefined)
         );
         this.spyObj.viewWillEnter.and.returnValue(
-            _viewObservable || ArrayObservable.of(undefined)
+            _viewObservable || of(undefined)
         );
         this.spyObj.viewWillLeave.and.returnValue(
-            _viewObservable || ArrayObservable.of(undefined)
+            _viewObservable || of(undefined)
         );
         this.spyObj.viewWillUnload.and.returnValue(
-            _viewObservable || ArrayObservable.of(undefined)
+            _viewObservable || of(undefined)
         );
     }
 

diff --git a/src/angular/nav-controller.ts b/src/angular/nav-controller.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 import { ViewControllerMock } from './view-controller';
 import { BaseMock } from '../base.mock';
 import deprecated from 'deprecated-decorator';
@@ -81,12 +81,12 @@ export class NavControllerMock extends BaseMock {
         this.spyObj.indexOf.and.returnValue(0);
         this.spyObj.getViews.and.returnValue([]);
         this.spyObj.isSwipeBackEnabled.and.returnValue(true);
-        this.spyObj.viewDidEnter = Observable.of();
-        this.spyObj.viewDidLeave = Observable.of();
-        this.spyObj.viewDidLoad = Observable.of();
-        this.spyObj.viewWillEnter = Observable.of();
-        this.spyObj.viewWillLeave = Observable.of();
-        this.spyObj.viewWillUnload = Observable.of();
+        this.spyObj.viewDidEnter = of();
+        this.spyObj.viewDidLeave = of();
+        this.spyObj.viewDidLoad = of();
+        this.spyObj.viewWillEnter = of();
+        this.spyObj.viewWillLeave = of();
+        this.spyObj.viewWillUnload = of();
         this.spyObj['length'].and.returnValue(0);
         this.spyObj['root'] = new ViewControllerMock();
         this.spyObj['rootParams'] = {};

diff --git a/src/angular/view-controller.ts b/src/angular/view-controller.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { NavParamsMock } from './nav-params';
 import { BaseMock } from '../base.mock';
 import deprecated from 'deprecated-decorator';
@@ -43,12 +43,12 @@ export class ViewControllerMock extends BaseMock {
     constructor() {
         super('ViewController', METHODS);
 
-        this.spyObj.willEnter.and.returnValue(Observable.of({}));
-        this.spyObj.didEnter.and.returnValue(Observable.of({}));
-        this.spyObj.willLeave.and.returnValue(Observable.of({}));
-        this.spyObj.didLeave.and.returnValue(Observable.of({}));
-        this.spyObj.willUnload.and.returnValue(Observable.of({}));
-        this.spyObj.didUnload.and.returnValue(Observable.of({}));
+        this.spyObj.willEnter.and.returnValue(of({}));
+        this.spyObj.didEnter.and.returnValue(of({}));
+        this.spyObj.willLeave.and.returnValue(of({}));
+        this.spyObj.didLeave.and.returnValue(of({}));
+        this.spyObj.willUnload.and.returnValue(of({}));
+        this.spyObj.didUnload.and.returnValue(of({}));
         this.spyObj.dismiss.and.returnValue(Promise.resolve());
         this.spyObj.onDidDismiss.and.returnValue(Promise.resolve());
         this.spyObj.onWillDismiss.and.returnValue(Promise.resolve());
@@ -60,7 +60,7 @@ export class ViewControllerMock extends BaseMock {
         this.spyObj.contentRef.and.returnValue(Promise.resolve());
         this.spyObj.hasNavbar.and.returnValue(true);
         this.spyObj.index.and.returnValue(true);
-        this.spyObj.subscribe.and.returnValue(Observable.of({}));
+        this.spyObj.subscribe.and.returnValue(of({}));
         this.spyObj.getNav.and.returnValue({});
         this.spyObj.getIONContent.and.returnValue({});
 

diff --git a/src/native/keyboard.ts b/src/native/keyboard.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 
 export class KeyboardMock {
     public static instance(): any {
@@ -11,8 +11,8 @@ export class KeyboardMock {
             'onKeyboardHide'
         ]);
 
-        instance.onKeyboardShow.and.returnValue(Observable.empty());
-        instance.onKeyboardHide.and.returnValue(Observable.empty());
+        instance.onKeyboardShow.and.returnValue(of(null));
+        instance.onKeyboardHide.and.returnValue(of(null));
 
         return instance;
     }

diff --git a/src/native/network.ts b/src/native/network.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 
 export class NetworkMock {
     public static instance(networkType: string): any {
@@ -11,9 +11,9 @@ export class NetworkMock {
         ]);
         instance.type.and.returnValue(networkType || 'wifi');
         instance.downlinkMax.and.returnValue('42');
-        instance.onChange.and.returnValue(Observable.empty());
-        instance.onDisconnect.and.returnValue(Observable.empty());
-        instance.onConnect.and.returnValue(Observable.empty());
+        instance.onChange.and.returnValue(of(null));
+        instance.onDisconnect.and.returnValue(of(null));
+        instance.onConnect.and.returnValue(of(null));
         return instance;
     }
 }
diff --git a/src/native/nfc.ts b/src/native/nfc.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 
 export class NFCMock {
     public static instance(): any {
@@ -20,19 +20,19 @@ export class NFCMock {
             'stringToBytes',
             'bytesToHexString'
         ]);
-        instance.addNdefListener.and.returnValue(Observable.empty());
-        instance.addTagDiscoveredListener.and.returnValue(Observable.empty());
-        instance.addMimeTypeListener.and.returnValue(Observable.empty());
-        instance.addNdefFormatableListener.and.returnValue(Observable.empty());
-        instance.write.and.returnValue(Observable.empty());
-        instance.makeReadyOnly.and.returnValue(Observable.empty());
-        instance.share.and.returnValue(Observable.empty());
-        instance.unshare.and.returnValue(Observable.empty());
-        instance.erase.and.returnValue(Observable.empty());
-        instance.handover.and.returnValue(Observable.empty());
-        instance.stopHandover.and.returnValue(Observable.empty());
-        instance.showSettings.and.returnValue(Observable.empty());
-        instance.enabled.and.returnValue(Observable.empty());
+        instance.addNdefListener.and.returnValue(of(null));
+        instance.addTagDiscoveredListener.and.returnValue(of(null));
+        instance.addMimeTypeListener.and.returnValue(of(null));
+        instance.addNdefFormatableListener.and.returnValue(of(null));
+        instance.write.and.returnValue(of(null));
+        instance.makeReadyOnly.and.returnValue(of(null));
+        instance.share.and.returnValue(of(null));
+        instance.unshare.and.returnValue(of(null));
+        instance.erase.and.returnValue(of(null));
+        instance.handover.and.returnValue(of(null));
+        instance.stopHandover.and.returnValue(of(null));
+        instance.showSettings.and.returnValue(of(null));
+        instance.enabled.and.returnValue(of(null));
         instance.bytesToString.and.returnValue('');
         instance.stringToBytes.and.returnValue([]);
         instance.bytesToHexString.and.returnValue('');

diff --git a/src/native/three-dee-touch.ts b/src/native/three-dee-touch.ts
@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable, of } from 'rxjs';
 
 export class ThreeDeeTouchMock {
     public static instance(): any {
@@ -11,8 +11,8 @@ export class ThreeDeeTouchMock {
             'disableLinkPreview'
         ]);
         instance.isAvailable.and.returnValue(Promise.resolve(true));
-        instance.watchForTouches.and.returnValue(Observable.of({}));
-        instance.onHomeIconPressed.and.returnValue(Observable.empty());
+        instance.watchForTouches.and.returnValue(of({}));
+        instance.onHomeIconPressed.and.returnValue(of(null));
 
         return instance;
     }