mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
Merge pull request #821 from NativeScript/atanasovg/webview-fix
Extracts common logic into web-view-common. The check for http/https …
This commit is contained in:
@@ -30,7 +30,7 @@ var _createWebViewFunc = function (): webViewModule.WebView {
|
||||
return webView;
|
||||
}
|
||||
|
||||
export var testLoadExistingUrl = function () {
|
||||
function prepare(): webViewModule.WebView {
|
||||
var newPage: page.Page;
|
||||
var webView = _createWebViewFunc();
|
||||
var pageFactory = function (): page.Page {
|
||||
@@ -41,6 +41,12 @@ export var testLoadExistingUrl = function () {
|
||||
|
||||
helper.navigate(pageFactory);
|
||||
|
||||
return webView;
|
||||
}
|
||||
|
||||
export var testLoadExistingUrl = function () {
|
||||
var webView = prepare();
|
||||
|
||||
var testFinished = false;
|
||||
var actualUrl;
|
||||
var actualError;
|
||||
@@ -80,15 +86,7 @@ export var testLoadExistingUrl = function () {
|
||||
}
|
||||
|
||||
export var testLoadLocalFile = function () {
|
||||
var newPage: page.Page;
|
||||
var webView = _createWebViewFunc();
|
||||
var pageFactory = function (): page.Page {
|
||||
newPage = new page.Page();
|
||||
newPage.content = webView;
|
||||
return newPage;
|
||||
};
|
||||
|
||||
helper.navigate(pageFactory);
|
||||
var webView = prepare();
|
||||
|
||||
var testFinished = false;
|
||||
var actualHtml;
|
||||
@@ -142,15 +140,7 @@ export var testLoadLocalFile = function () {
|
||||
}
|
||||
|
||||
export var testLoadHTMLString = function () {
|
||||
var newPage: page.Page;
|
||||
var webView = _createWebViewFunc();
|
||||
var pageFactory = function (): page.Page {
|
||||
newPage = new page.Page();
|
||||
newPage.content = webView;
|
||||
return newPage;
|
||||
};
|
||||
|
||||
helper.navigate(pageFactory);
|
||||
var webView = prepare();
|
||||
|
||||
var testFinished = false;
|
||||
var actualHtml;
|
||||
@@ -204,15 +194,7 @@ export var testLoadHTMLString = function () {
|
||||
}
|
||||
|
||||
export var testLoadInvalidUrl = function () {
|
||||
var newPage: page.Page;
|
||||
var webView = _createWebViewFunc();
|
||||
var pageFactory = function (): page.Page {
|
||||
newPage = new page.Page();
|
||||
newPage.content = webView;
|
||||
return newPage;
|
||||
};
|
||||
|
||||
helper.navigate(pageFactory);
|
||||
var webView = prepare();
|
||||
|
||||
var testFinished = false;
|
||||
var actualError;
|
||||
@@ -237,3 +219,31 @@ export var testLoadInvalidUrl = function () {
|
||||
TKUnit.assert(false, "TIMEOUT");
|
||||
}
|
||||
}
|
||||
|
||||
export var testLoadUpperCaseSrc = function () {
|
||||
var webView = prepare();
|
||||
|
||||
var testFinished = false;
|
||||
var actualSrc;
|
||||
var actualError;
|
||||
|
||||
webView.on(webViewModule.WebView.loadFinishedEvent, function (args: webViewModule.LoadEventData) {
|
||||
actualSrc = args.url;
|
||||
actualError = args.error;
|
||||
testFinished = true;
|
||||
});
|
||||
var targetSrc = "HTTP://nsbuild01.telerik.com/docs/";
|
||||
webView.src = targetSrc;
|
||||
|
||||
TKUnit.wait(4);
|
||||
|
||||
helper.goBack();
|
||||
|
||||
if (testFinished) {
|
||||
TKUnit.assert(actualSrc === targetSrc.toLowerCase(), "args.url should equal '" + targetSrc.toLowerCase() + "'");
|
||||
TKUnit.assert(actualError === undefined, actualError);
|
||||
}
|
||||
else {
|
||||
TKUnit.assert(false, "TIMEOUT");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user