Merge pull request #7231 from NativeScript/mdonev/restore-ui-tests-pre-borderdrawable-outline-state

SvetoslavTsenov · web-flow · commit c85f3232dc2e · 2019-05-10T23:22:58.000+03:00
chore: update ui tests with androidElevation
diff --git a/apps/app/ui-tests-app/button/button-border.css b/apps/app/ui-tests-app/button/button-border.css
@@ -46,7 +46,7 @@ Button {
 }
 
 #s10 {
-    border-width: 5 0; border-color: black; background-color: white;
+    android-elevation: 0; border-width: 5 0; border-color: black;
 }
 
 #s11 {
diff --git a/apps/app/ui-tests-app/css/pixels.xml b/apps/app/ui-tests-app/css/pixels.xml
@@ -4,15 +4,15 @@
     <Label text="pixels" />
     <StackLayout borderWidth="1px" borderColor="black" horizontalAlignment="left" verticalAlignment="top" orientation="horizontal" padding="1px">
       <Label     text="Label"      borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" />
-      <Button    text="Button"     borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" backgroundColor="orange" />
+      <Button    text="Button"     borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" androidElevation="0" />
       <TextView  text="Text View"  borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" />
       <TextField text="Text Field" borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" />
       <Image src="~/ui-tests-app/resources/images/gravatar.png" borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" />
     </StackLayout>
 
      <StackLayout borderWidth="2px" borderColor="green" orientation="horizontal" padding="2px">
       <Label     text="Label"      borderWidth="5px" borderRadius="10px" borderColor="black" padding="5px" margin="5px" />
-      <Button    text="Button"     borderWidth="4px" borderRadius="10px" borderColor="black" padding="4px" margin="4px" backgroundColor="orange" />
+      <Button    text="Button"     borderWidth="4px" borderRadius="10px" borderColor="black" padding="4px" margin="4px" androidElevation="0" />
       <TextView  text="Text View"  borderWidth="3px" borderRadius="10px" borderColor="black" padding="3px" margin="3px" />
       <TextField text="Text Field" borderWidth="2px" borderRadius="10px" borderColor="black" padding="2px" margin="2px" />
     </StackLayout>
@@ -32,15 +32,15 @@
     <Label text="device independent pixels" />
     <StackLayout borderWidth="1" borderColor="black" horizontalAlignment="left" verticalAlignment="top" orientation="horizontal" padding="1">
       <Label     text="Label"      borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" />
-      <Button    text="Button"     borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" backgroundColor="orange" />
+      <Button    text="Button"     borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" androidElevation="0" />
       <TextView  text="Text View"  borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" />
       <TextField text="Text Field" borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" />
       <Image src="~/ui-tests-app/resources/images/gravatar.png" borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" />
     </StackLayout>
 
      <StackLayout borderWidth="2" borderColor="green" orientation="horizontal" padding="2">
       <Label     text="Label"      borderWidth="5" borderRadius="10" borderColor="black" padding="5" margin="5" />
-      <Button    text="Button"     borderWidth="4" borderRadius="10" borderColor="black" padding="4" margin="4" backgroundColor="orange" />
+      <Button    text="Button"     borderWidth="4" borderRadius="10" borderColor="black" padding="4" margin="4" androidElevation="0" />
       <TextView  text="Text View"  borderWidth="3" borderRadius="10" borderColor="black" padding="3" margin="3" />
       <TextField text="Text Field" borderWidth="2" borderRadius="10" borderColor="black" padding="2" margin="2" />
     </StackLayout>
diff --git a/apps/app/ui-tests-app/flexbox/flexbox.css b/apps/app/ui-tests-app/flexbox/flexbox.css
@@ -20,9 +20,9 @@
     border-color: gray;
 }
 .control Button {
+    android-elevation: 0;
     border-width: 1 1 0 0;
     border-color: gray;
-    background-color: white;
     font-size: 9;
     padding: 0;
     height: 0;
diff --git a/apps/app/ui-tests-app/issues/issue-3113.css b/apps/app/ui-tests-app/issues/issue-3113.css
@@ -1,16 +1,16 @@
 #button1 {
-    border-color: transparent;
+    android-elevation: 0;
+    border-color: rgba(0, 0, 0, 0);
     border-width: 3;
-    background-color: white;
 }
 
 #button2 {
+    android-elevation: 0;
     border-color: rgba(0, 0, 0, 0.5);
     border-width: 3;
-    background-color: white;
 }
 
 #button3 {
+    android-elevation: 0;
     border-width: 3;
-    background-color: white;
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ Button {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`#s10 {`
`49`		`- border-width: 5 0; border-color: black; background-color: white;`
	`49`	`+ android-elevation: 0; border-width: 5 0; border-color: black;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`#s11 {`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`#button1 {`
`2`		`- border-color: transparent;`
	`2`	`+ android-elevation: 0;`
	`3`	`+ border-color: rgba(0, 0, 0, 0);`
`3`	`4`	`border-width: 3;`
`4`		`- background-color: white;`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`#button2 {`
	`8`	`+ android-elevation: 0;`
`8`	`9`	`border-color: rgba(0, 0, 0, 0.5);`
`9`	`10`	`border-width: 3;`
`10`		`- background-color: white;`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`#button3 {`
	`14`	`+ android-elevation: 0;`
`14`	`15`	`border-width: 3;`
`15`		`- background-color: white;`
`16`	`16`	`}`