From d2fbaa33070ed4e809b61e1d88d852fd3b31c7a6 Mon Sep 17 00:00:00 2001 From: atanasovg Date: Tue, 31 May 2016 13:39:04 +0300 Subject: [PATCH] Fix failing test --- tests/app/ui/page/page-tests.android.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/app/ui/page/page-tests.android.ts b/tests/app/ui/page/page-tests.android.ts index 949a82b1e..18fbd83a6 100644 --- a/tests/app/ui/page/page-tests.android.ts +++ b/tests/app/ui/page/page-tests.android.ts @@ -143,18 +143,22 @@ export var test_ChangePageCaching_BeforeNavigated_DoesNotThrow = function () { export var test_Resolve_Fragment_ForPage = function () { var testPage: PageModule.Page; + var navigatedTo = false; + var pageFactory = function () { - var testPage = new PageModule.Page(); + testPage = new PageModule.Page(); testPage.content = new LabelModule.Label(); + // use navigatedTo to ensure the fragment is already created + testPage.on("navigatedTo", function(args) { + navigatedTo = true; + }); return testPage; }; - var topFrame = frame.topmost(); - helper.navigate(pageFactory); - TKUnit.waitUntilReady(() => topFrame.currentPage !== null && topFrame.currentPage === testPage); + TKUnit.waitUntilReady(() => navigatedTo === true); - var fragment = topFrame.android.fragmentForPage(testPage); + var fragment = frame.topmost().android.fragmentForPage(testPage); TKUnit.assertFalse(types.isNullOrUndefined(fragment), "Failed to resolve native fragment for page"); } \ No newline at end of file