javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Increased the wait to make sure the test passes in PR builds.

Browse Source
This commit is contained in:
Rossen Hristov
2015-10-20 16:29:55 +03:00
parent 0a0ab98f31
commit 4dafdf1f5b
3 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/tests/ui/page/modal-page.ts
View File

@ -2,7 +2,7 @@
import TKUnit = require("../../TKUnit"); import TKUnit = require("../../TKUnit");
export function onShownModally(args: ShownModallyData) { export function onShownModally(args: ShownModallyData) {
TKUnit.wait(0.100); TKUnit.wait(0.350);
args.context.shownModally = true; args.context.shownModally = true;
args.closeCallback("return value"); args.closeCallback("return value");
} }

43
apps/tests/ui/page/page-tests-common.ts
View File

@ -394,49 +394,6 @@ export function test_WhenPageIsLoadedFrameCurrentPageIsTheSameInstance() {
} }
} }
export function test_WhenPageIsLoadedItCanShowAnotherPageAsModal_iOS() {
if (platform.device.os === platform.platformNames.android) {
// We can't show a modal from another modal on Android.
return;
}
var masterPage;
var ctx = {
shownModally: false
};
var modalClosed = false;
var modalCloseCallback = function (returnValue: any) {
TKUnit.assert(ctx.shownModally, "Modal-page must be shown!");
TKUnit.assert(returnValue === "return value", "Modal-page must return value!");
modalClosed = true;
}
var loadedEventHandler = function (args) {
var basePath = "ui/page/";
args.object.showModal(basePath + "modal-page", ctx, modalCloseCallback, false);
};
var masterPageFactory = function(): PageModule.Page {
masterPage = new PageModule.Page();
masterPage.id = "newPage";
masterPage.on(view.View.loadedEvent, loadedEventHandler);
var label = new LabelModule.Label();
label.text = "Text";
masterPage.content = label;
return masterPage;
};
try {
helper.navigate(masterPageFactory);
TKUnit.waitUntilReady(() => { return modalClosed; });
masterPage.off(view.View.loadedEvent, loadedEventHandler);
}
finally {
helper.goBack();
}
}
//export function test_ModalPage_Layout_is_Correct() { //export function test_ModalPage_Layout_is_Correct() {
// var testPage: PageModule.Page; // var testPage: PageModule.Page;
// var label: LabelModule.Label; // var label: LabelModule.Label;

40
apps/tests/ui/page/page-tests.ios.ts
View File

@ -3,6 +3,7 @@ import PageModule = require("ui/page");
import TKUnit = require("../../TKUnit"); import TKUnit = require("../../TKUnit");
import LabelModule = require("ui/label"); import LabelModule = require("ui/label");
import helper = require("../helper"); import helper = require("../helper");
import view = require("ui/core/view");
global.moduleMerge(PageTestCommon, exports); global.moduleMerge(PageTestCommon, exports);
@ -23,3 +24,42 @@ export function test_NavigateToNewPage_InnerControl() {
TKUnit.assert(label.android === undefined, "InnerControl.android should be undefined after navigate back."); TKUnit.assert(label.android === undefined, "InnerControl.android should be undefined after navigate back.");
TKUnit.assert(label.isLoaded === false, "InnerControl.isLoaded should become false after navigating back"); TKUnit.assert(label.isLoaded === false, "InnerControl.isLoaded should become false after navigating back");
} }
export function test_WhenPageIsLoadedItCanShowAnotherPageAsModal() {
var masterPage;
var ctx = {
shownModally: false
};
var modalClosed = false;
var modalCloseCallback = function (returnValue: any) {
TKUnit.assert(ctx.shownModally, "Modal-page must be shown!");
TKUnit.assert(returnValue === "return value", "Modal-page must return value!");
TKUnit.wait(0.350);
modalClosed = true;
}
var loadedEventHandler = function (args) {
var basePath = "ui/page/";
args.object.showModal(basePath + "modal-page", ctx, modalCloseCallback, false);
};
var masterPageFactory = function (): PageModule.Page {
masterPage = new PageModule.Page();
masterPage.id = "newPage";
masterPage.on(view.View.loadedEvent, loadedEventHandler);
var label = new LabelModule.Label();
label.text = "Text";
masterPage.content = label;
return masterPage;
};
try {
helper.navigate(masterPageFactory);
TKUnit.waitUntilReady(() => { return modalClosed; });
masterPage.off(view.View.loadedEvent, loadedEventHandler);
}
finally {
helper.goBack();
}
}