Skip to content

Commit d2f34a9

Browse files
Merge pull request NativeScript#2486 from NativeScript/tsenov/ui-tests
Include webtest page
2 parents 742d063 + 2a14c1a commit d2f34a9

File tree

3 files changed

+33
-2
lines changed

3 files changed

+33
-2
lines changed

apps/app/ui-tests-app/mainPage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ export function pageLoaded(args: EventData) {
2626
examples.set("tab-view", "tab-view/main-page");
2727
examples.set("layouts", "layouts/main-page");
2828
examples.set("pages-events", "pages/main-page");
29-
29+
examples.set("webview", "web-view/main-page");
30+
3031
examples.set("modalview", "modal-view/modal-view");
3132
examples.set("dialogs", "dialogs/dialogs");
3233
examples.set("htmlview", "html-view/html-view");
3334
examples.set("timePicker", "time-picker/time-picker");
3435
examples.set("animeBG", "animations/background");
3536
examples.set("transitions", "transitions/page0");
3637
examples.set("segStyle", "segmented-bar/all");
37-
examples.set("webview", "web-view/web-view");
3838

3939
//examples.set("listview_binding", "pages/listview_binding");
4040
//examples.set("textfield", "text-field/text-field");
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { EventData } from "data/observable";
2+
import { MianPageViewModel } from "../mainPage";
3+
import { WrapLayout } from "ui/layouts/wrap-layout";
4+
import { Page } from "ui/page";
5+
6+
export function pageLoaded(args: EventData) {
7+
let page = <Page>args.object;
8+
let view = require("ui/core/view");
9+
10+
let wrapLayout = view.getViewById(page, "wrapLayoutWithExamples");
11+
12+
let examples: Map<string, string> = new Map<string, string>();
13+
14+
examples.set("webview", "web-view/web-view");
15+
examples.set("webtest", "web-view/web-view-test");
16+
17+
let viewModel = new SubMianPageViewModel(wrapLayout, examples);
18+
page.bindingContext = viewModel;
19+
}
20+
21+
export class SubMianPageViewModel extends MianPageViewModel {
22+
constructor(container: WrapLayout, examples: Map<string, string>) {
23+
super(container, examples);
24+
}
25+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<Page loaded="pageLoaded">
3+
<ScrollView orientation="vertical" row="1">
4+
<WrapLayout id="wrapLayoutWithExamples"/>
5+
</ScrollView>
6+
</Page>

0 commit comments

Comments
 (0)