Merge pull request NativeScript#116 from NativeScript/feature/router-test-fixes

vakrilov · vakrilov · commit 8ce373e96e98 · 2016-03-17T17:37:38.000+02:00
Fix router tests in IOS
diff --git a/src/nativescript-angular/router/page-router-outlet.ts b/src/nativescript-angular/router/page-router-outlet.ts
@@ -188,8 +188,8 @@ export class PageRouterOutlet extends RouterOutlet {
 
         this.location.navigateToNewPage();
         return new Promise((resolve, reject) => {
-            page.on('loaded', () => {
-                // Finish activation when page is fully loaded.
+            page.on('navigatedTo', () => {
+                // Finish activation when page is fully navigated to.
                 resolve(componentRef)
             });
 
diff --git a/tests/app/tests/router.ts b/tests/app/tests/router.ts
@@ -154,9 +154,14 @@ describe('page-router-outlet', () => {
     var initialBackstackLength: number;
     var initalPage: Page;
 
-    before(() => {
-        initialBackstackLength = topmost().backStack.length;
-        initalPage = topmost().currentPage;
+    before((done) => {
+        // HACK: Wait for the navigations from the test runner app
+        // Remove the setTimeout when test runner start tests on page.navigatedTo
+        setTimeout(() => {
+            initialBackstackLength = topmost().backStack.length;
+            initalPage = topmost().currentPage;
+            done();
+        }, 1000); 
     })
 
     beforeEach((done) => {
diff --git a/tests/app/tests/test-app.ts b/tests/app/tests/test-app.ts
@@ -55,7 +55,11 @@ export function bootstrapTestApp(appComponentType: any, providers: ProviderArray
     const rootLayout = <LayoutBase>page.content;
     const viewRoot = new GridLayout();
     rootLayout.addChild(viewRoot);
-    GridLayout.setRow(rootLayout, 50);
+    (<any>viewRoot.style).backgroundColor = "white";
+    viewRoot.margin = "20";
+    viewRoot.opacity = 0.7;
+    GridLayout.setRowSpan(rootLayout, 50);
+    GridLayout.setColumnSpan(rootLayout, 50);
     
     const rootViewProvider = provide(APP_ROOT_VIEW, { useValue: viewRoot });
     return bootstrap(appComponentType, providers.concat(rootViewProvider)).then((componentRef) => {
diff --git a/tests/package.json b/tests/package.json
@@ -3,6 +3,9 @@
 		"id": "org.nativescript.helloworldng",
 		"tns-android": {
 			"version": "1.7.0"
+		},
+		"tns-ios": {
+			"version": "1.7.0"
 		}
 	},
 	"name": "nativescript-hello-world-ng",
