chore: migrated test porject to ng6+rxjs6

Author: vakrilov

tests/app/base.component.ts

@@ -1,6 +1,6 @@
 import { InjectionToken, OnInit, OnDestroy } from "@angular/core";
 export const HOOKS_LOG = new InjectionToken("Hooks log");
-import { BehaviorSubject } from "rxjs/BehaviorSubject";
+import { BehaviorSubject } from "rxjs";
 
 export class BaseComponent implements OnInit, OnDestroy {
     protected name: string = "";

tests/app/first.component.ts

@@ -2,7 +2,7 @@ import { Router, ActivatedRoute } from "@angular/router";
 import { Component, Inject } from "@angular/core";
 import { RouterExtensions } from "nativescript-angular/router";
 import { HOOKS_LOG, BaseComponent } from "./base.component";
-import { BehaviorSubject } from "rxjs/BehaviorSubject";
+import { BehaviorSubject } from "rxjs";
 
 @Component({
     selector: "first-comp",

tests/app/main.ts

@@ -31,7 +31,7 @@ import { NavigationApp } from "./snippets/navigation/router-outlet";
 
 import { rendererTraceCategory, routerTraceCategory } from "nativescript-angular/trace";
 
-import { BehaviorSubject } from "rxjs/BehaviorSubject";
+import { BehaviorSubject } from "rxjs";
 
 import { GridLayout, ItemSpec } from "tns-core-modules/ui/layouts/grid-layout/grid-layout";
 

tests/app/second.component.ts

@@ -3,7 +3,7 @@ import { Component, Inject, OnInit } from "@angular/core";
 import { Location } from "@angular/common";
 import { RouterExtensions } from "nativescript-angular/router";
 import { HOOKS_LOG, BaseComponent } from "./base.component";
-import { BehaviorSubject } from "rxjs/BehaviorSubject";
+import { BehaviorSubject } from "rxjs";
 
 @Component({
     selector: "second-comp",

tests/app/snippets/navigation/route-params.ts

@@ -12,15 +12,15 @@ class MyComponent {
 
 // >> router-params-page-route
 import { PageRoute } from "nativescript-angular/router";
-import "rxjs/add/operator/switchMap";
+import { switchMap } from "rxjs/operators";
 
 class MyPageComponent {
   id: number;
   constructor(private pageRoute: PageRoute) {
     // use switchMap to get the latest activatedRoute instance
-    this.pageRoute.activatedRoute
-      .switchMap(activatedRoute => activatedRoute.params)
-      .forEach((params) => { this.id = +params["id"]; });
+    this.pageRoute.activatedRoute.pipe(
+      switchMap(activatedRoute => activatedRoute.params)
+    ).forEach((params) => { this.id = +params["id"]; });
   }
 }
 // << router-params-page-route

tests/app/tests/http.ts

@@ -6,7 +6,7 @@ import {
 } from "@angular/core/testing";
 import { ReflectiveInjector, Injectable } from "@angular/core";
 import { Request, BaseRequestOptions, ConnectionBackend, Http, Response, ResponseOptions } from "@angular/http";
-import "rxjs/add/operator/map";
+import { map } from "rxjs/operators";
 import { MockBackend } from "@angular/http/testing";
 import { NSHttp } from "nativescript-angular/http/ns-http";
 import { NSFileSystem } from "nativescript-angular/file-system/ns-file-system";
@@ -62,14 +62,18 @@ describe("Http", () => {
     });
 
     it("should work with local files prefixed with '~'", () => {
-        http.get("~/test.json").map(res => res.json()).subscribe((response: any) => {
+        http.get("~/test.json").pipe(
+            map(res => res.json())
+        ).subscribe((response: any) => {
             assert.strictEqual(3, response.length);
             assert.strictEqual("Alex", response[0].name);
         });
     });
 
     it("request method should work with local files prefixed with '~'", () => {
-        http.request("~/test.json").map(res => res.json()).subscribe((response: any) => {
+        http.request("~/test.json").pipe(
+            map(res => res.json())
+        ).subscribe((response: any) => {
             assert.strictEqual(3, response.length);
             assert.strictEqual("Alex", response[0].name);
         });
@@ -81,14 +85,18 @@ describe("Http", () => {
             method: 'GET',
             url
         });
-        http.request(req).map(res => res.json()).subscribe((response: any) => {
+        http.request(req).pipe(
+            map(res => res.json())
+        ).subscribe((response: any) => {
             assert.strictEqual(3, response.length);
             assert.strictEqual("Alex", response[0].name);
         });
     });
 
     it("should work with local files prefixed with '/'", () => {
-        http.get("/test.json").map(res => res.json()).subscribe((response: any) => {
+        http.get("/test.json").pipe(
+            map(res => res.json())
+        ).subscribe((response: any) => {
             assert.strictEqual(3, response.length);
             assert.strictEqual("Panayot", response[2].name);
         });
@@ -97,7 +105,9 @@ describe("Http", () => {
     it("should work with remote files", () => {
         let connection: any;
         backend.connections.subscribe((c: any) => connection = c);
-        http.get("http://www.nativescript.org/test.json").map(res => res.json()).subscribe((response: any) => {
+        http.get("http://www.nativescript.org/test.json").pipe(
+            map(res => res.json())
+        ).subscribe((response: any) => {
             assert.strictEqual(3, response.length);
             assert.strictEqual("Rosen", response[1].name);
         });

tests/app/tests/snippets.ts

@@ -2,7 +2,7 @@
 import { assert } from "./test-config";
 
 import { NavigationEnd, NavigationStart } from "@angular/router";
-import { Subscription } from "rxjs/Subscription";
+import { Subscription } from "rxjs";
 import { TestApp, bootstrapTestApp, destroyTestApp } from "./test-app";
 
 import { GestureComponent } from "../snippets/gestures.component";

tests/package.json

@@ -2,10 +2,10 @@
   "nativescript": {
     "id": "org.nativescript.ngtests",
     "tns-ios": {
-      "version": "next"
+      "version": "4.0.2-2018-04-13-01"
     },
     "tns-android": {
-      "version": "next"
+      "version": "4.1.0-2018.4.16.8"
     }
   },
   "name": "ngtests",
@@ -26,18 +26,18 @@
   ],
   "homepage": "http://nativescript.org",
   "dependencies": {
-    "@angular/animations": "~5.2.0",
-    "@angular/common": "~5.2.0",
-    "@angular/compiler": "~5.2.0",
-    "@angular/core": "~5.2.0",
-    "@angular/forms": "~5.2.0",
-    "@angular/http": "~5.2.0",
-    "@angular/platform-browser": "~5.2.0",
-    "@angular/platform-browser-dynamic": "~5.2.0",
-    "@angular/router": "~5.2.0",
+    "@angular/animations": "~6.0.0-rc.3",
+    "@angular/common": "~6.0.0-rc.3",
+    "@angular/compiler": "~6.0.0-rc.3",
+    "@angular/core": "~6.0.0-rc.3",
+    "@angular/forms": "~6.0.0-rc.3",
+    "@angular/http": "~6.0.0-rc.3",
+    "@angular/platform-browser": "~6.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "~6.0.0-rc.3",
+    "@angular/router": "~6.0.0-rc.3",
     "nativescript-angular": "../nativescript-angular",
     "nativescript-unit-test-runner": "^0.3.4",
-    "rxjs": "^5.5.0",
+    "rxjs": "~6.0.0-rc.1",
     "tns-core-modules": "next",
     "zone.js": "^0.8.4"
   },
@@ -66,7 +66,7 @@
     "socket.io-client": "1.4.8",
     "tslib": "^1.7.1",
     "tslint": "^4.5.1",
-    "typescript": "~2.6.2",
+    "typescript": "~2.7.2",
     "mocha": "~3.5.0"
   },
   "scripts": {