From f578f4eec4419c55e18b9df9be7790341e161f09 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Mon, 12 Dec 2016 13:16:31 +0200
Subject: [PATCH] Added UI test for nested components CSS application

Resolves #1639
---
 apps/app/ui-tests-app/app.css                 | 20 +++++++++++++++++++
 .../issues/component/customView.xml           |  4 ++++
 .../issues/component2/customView2.xml         |  4 ++++
 .../issues/component3/customView3.xml         |  3 +++
 apps/app/ui-tests-app/issues/issue-1639.xml   |  6 ++++++
 apps/app/ui-tests-app/issues/main-page.ts     |  1 +
 apps/package.json                             |  4 ++--
 7 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 apps/app/ui-tests-app/issues/component/customView.xml
 create mode 100644 apps/app/ui-tests-app/issues/component2/customView2.xml
 create mode 100644 apps/app/ui-tests-app/issues/component3/customView3.xml
 create mode 100644 apps/app/ui-tests-app/issues/issue-1639.xml

diff --git a/apps/app/ui-tests-app/app.css b/apps/app/ui-tests-app/app.css
index 6405512e2..7eac464ba 100644
--- a/apps/app/ui-tests-app/app.css
+++ b/apps/app/ui-tests-app/app.css
@@ -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;
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/issues/component/customView.xml b/apps/app/ui-tests-app/issues/component/customView.xml
new file mode 100644
index 000000000..7b9ec87ad
--- /dev/null
+++ b/apps/app/ui-tests-app/issues/component/customView.xml
@@ -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>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/issues/component2/customView2.xml b/apps/app/ui-tests-app/issues/component2/customView2.xml
new file mode 100644
index 000000000..01d4eca37
--- /dev/null
+++ b/apps/app/ui-tests-app/issues/component2/customView2.xml
@@ -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>
diff --git a/apps/app/ui-tests-app/issues/component3/customView3.xml b/apps/app/ui-tests-app/issues/component3/customView3.xml
new file mode 100644
index 000000000..b0cd7c01b
--- /dev/null
+++ b/apps/app/ui-tests-app/issues/component3/customView3.xml
@@ -0,0 +1,3 @@
+<StackLayout>
+    <Label class="ui-tests-app-issue-1639-yellow" text="customView3 yellow" textWrap="true" />
+</StackLayout>
diff --git a/apps/app/ui-tests-app/issues/issue-1639.xml b/apps/app/ui-tests-app/issues/issue-1639.xml
new file mode 100644
index 000000000..29739e292
--- /dev/null
+++ b/apps/app/ui-tests-app/issues/issue-1639.xml
@@ -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>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/issues/main-page.ts b/apps/app/ui-tests-app/issues/main-page.ts
index be56e767a..5ec901700 100644
--- a/apps/app/ui-tests-app/issues/main-page.ts
+++ b/apps/app/ui-tests-app/issues/main-page.ts
@@ -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;
diff --git a/apps/package.json b/apps/package.json
index 79339fb89..ab72f800a 100644
--- a/apps/package.json
+++ b/apps/package.json
@@ -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": "*",