Skip to content

Added UI test for nested components CSS application #3283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hamorphis merged 1 commit into from
Dec 12, 2016
Merged

Added UI test for nested components CSS application #3283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions apps/app/ui-tests-app/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
#app {
background-color: lightblue;
}

.ui-tests-app-issue-1639-red {
color: red;
margin-left: 0;
}

.ui-tests-app-issue-1639-green {
color: green;
margin-left: 10;
}

.ui-tests-app-issue-1639-blue {
color: blue;
margin-left: 20;
}

.ui-tests-app-issue-1639-yellow {
color: yellow;
margin-left: 30;
}
4 changes: 4 additions & 0 deletions apps/app/ui-tests-app/issues/component/customView.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<StackLayout xmlns:cC2="/ui-tests-app/issues/component2">
<Label class="ui-tests-app-issue-1639-green" text="customView green" textWrap="true" />
<cC2:customView2/>
</StackLayout>
4 changes: 4 additions & 0 deletions apps/app/ui-tests-app/issues/component2/customView2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<StackLayout xmlns:cC3="/ui-tests-app/issues/component3">
<Label class="ui-tests-app-issue-1639-blue" text="customView2 blue" textWrap="true" />
<cC3:customView3/>
</StackLayout>
3 changes: 3 additions & 0 deletions apps/app/ui-tests-app/issues/component3/customView3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<StackLayout>
<Label class="ui-tests-app-issue-1639-yellow" text="customView3 yellow" textWrap="true" />
</StackLayout>
6 changes: 6 additions & 0 deletions apps/app/ui-tests-app/issues/issue-1639.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:cC="ui-tests-app/issues/component">
<StackLayout>
<Label class="ui-tests-app-issue-1639-red" text="main-page red" textWrap="true" />
<cC:customView/>
</StackLayout>
</Page>
1 change: 1 addition & 0 deletions apps/app/ui-tests-app/issues/main-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export function pageLoaded(args: EventData) {
examples.set("3164", "issues/issue-3164");
examples.set("3175", "issues/issue-3175");
examples.set("3211", "issues/issue-3211");
examples.set("1639", "issues/issue-1639");

let viewModel = new SubMainPageViewModel(wrapLayout, examples);
page.bindingContext = viewModel;
Expand Down
4 changes: 2 additions & 2 deletions apps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"version": "2.4.0"
},
"tns-android": {
"version": "2.4.0"
"version": "2.4.1"
}
},
"dependencies": {
"tns-core-modules": "2.4.0"
"tns-core-modules": "2.4.2"
},
"devDependencies": {
"tns-platform-declarations": "*",
Expand Down