javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved text-align and font-size to TextBase and fixed a WebView test.

Browse Source
This commit is contained in:
Rossen Hristov
2015-04-03 16:38:39 +03:00
parent d74250dea8
commit 69dc92026c
6 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/tests/testRunner.ts
View File

@@ -10,7 +10,6 @@ allTests["WRAPLAYOUT"] = require("./layouts/wrap-layout-tests");
allTests["ABSOLUTELAYOUT"] = require("./layouts/absolute-layout-tests");
allTests["GRIDLAYOUT"] = require("./layouts/grid-layout-tests");
allTests["STACKLAYOUT"] = require("./layouts/stack-layout-tests");
allTests["WEB-VIEW"] = require("./ui/web-view/web-view-tests");
allTests["PLATFORM"] = require("./platform-tests");
allTests["STYLE-PROPERTIES"] = require("./ui/style/style-properties-tests");
allTests["SCROLL-VIEW"] = require("./ui/scroll-view/scroll-view-tests");
@@ -51,6 +50,7 @@ allTests["XML-DECLARATION"] = require("./xml-declaration/xml-declaration-tests")
allTests["LIST-PICKER"] = require("./ui/list-picker/list-picker-tests");
allTests["DATE-PICKER"] = require("./ui/date-picker/date-picker-tests");
allTests["TIME-PICKER"] = require("./ui/time-picker/time-picker-tests");
allTests["WEB-VIEW"] = require("./ui/web-view/web-view-tests");
var testsWithLongDelay = {
testLocation: 10000,

11
apps/tests/ui/web-view/web-view-tests.ts
View File

@@ -63,7 +63,7 @@ export var testLoadExistingUrl = function () {
});
webView.url = "https://httpbin.org/html";
TKUnit.wait(2);
TKUnit.wait(4);
helper.goBack();
@@ -89,14 +89,17 @@ export var testLoadInvalidUrl = function () {
var testFinished = false;
var actualError;
webView.on(webViewModule.knownEvents.loadFinished, function (args: webViewModule.LoadEventData) {
testFinished = true;
if (actualError) {
// Android call this twice -- the second time args.error is undefined.
return;
}
actualError = args.error;
testFinished = true;
});
webView.url = "kofti://mnogokofti";
TKUnit.wait(2);
TKUnit.wait(4);
helper.goBack();