text(TypeScriptApp): update resources and tests

Author: vchimev

Diff for: demo/TypeScriptApp/app/main-page.android.xml

@@ -24,12 +24,12 @@ https://docs.nativescript.org/ui/components.
     class names available for styling your app at https://docs.nativescript.org/ui/theme.
     -->
     <StackLayout class="p-20">
-        <GridLayout rows="auto, auto, auto" columns="auto, auto">
-            <GridLayout row="0" automationText="styleInline" width="30px" height="30px" backgroundColor="#7F9" margin="10px" />
+        <GridLayout rows="50px, 50px, 50px" columns="50px, auto">
+            <GridLayout row="0" automationText="styleInline" width="30px" height="30px" backgroundColor="#7F9" />
             <Label row="0" col="1" text="inline style" verticalAlignment="center" />
-            <GridLayout row="1" automationText="stylePage" width="30px" height="30px" class="page-class" margin="10px" />
+            <GridLayout row="1" automationText="stylePage" width="30px" height="30px" class="page-class" />
             <Label row="1" col="1" text="page style" verticalAlignment="center" />
-            <GridLayout row="2" automationText="styleApp" width="30px" height="30px" class="app-class" margin="10px" />
+            <GridLayout row="2" automationText="styleApp" width="30px" height="30px" class="app-class" />
             <Label row="2" col="1" text="app style" verticalAlignment="center" />
         </GridLayout>
         <Label text="Tap the button" class="h1 text-center"/>

Diff for: demo/TypeScriptApp/app/main-page.ios.xml

@@ -24,12 +24,12 @@ https://docs.nativescript.org/ui/components.
     class names available for styling your app at https://docs.nativescript.org/ui/theme.
     -->
     <StackLayout class="p-20">
-        <GridLayout rows="auto, auto, auto" columns="auto, auto">
-            <GridLayout row="0" automationText="styleInline" width="30px" height="30px" backgroundColor="#999" margin="10px" />
+        <GridLayout rows="50px, 50px, 50px" columns="50px, auto">
+            <GridLayout row="0" automationText="styleInline" width="30px" height="30px" backgroundColor="#999" />
             <Label row="0" col="1" text="inline style" verticalAlignment="center" />
-            <GridLayout row="1" automationText="stylePage" width="30px" height="30px" class="page-class" margin="10px" />
+            <GridLayout row="1" automationText="stylePage" width="30px" height="30px" class="page-class" />
             <Label row="1" col="1" text="page style" verticalAlignment="center" />
-            <GridLayout row="2" automationText="styleApp" width="30px" height="30px" class="app-class" margin="10px" />
+            <GridLayout row="2" automationText="styleApp" width="30px" height="30px" class="app-class" />
             <Label row="2" col="1" text="app style" verticalAlignment="center" />
         </GridLayout>
         <Label text="Tap the button" class="h1 text-center"/>

Diff for: demo/TypeScriptApp/app/views/second-page.xml

@@ -1,9 +1,8 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="onNavigatingTo" class="page">
     <Page.actionBar>
-        <ActionBar title="Second Page" icon="" class="action-bar">
-        </ActionBar>
+        <ActionBar title="Second Page" icon="" class="action-bar"></ActionBar>
     </Page.actionBar>
     <GridLayout>
-        <Button automationText="btn" text="0" width="110" height="110" tap="secondPageTap" />
+        <Button text="0" width="110" height="110" tap="secondPageTap" />
     </GridLayout>
-</Page>
+</Page>

Diff for: demo/TypeScriptApp/e2e/resources/images/TypeScriptApp/android/btnAndroid.png

@@ -34,14 +34,14 @@ describe("sample scenario", () => {
         await btnNav.tap();
 
         const secondPage = await driver.findElementByText("Second Page");
-        const btn = await driver.findElementByText("btn");
-
-        const result = await driver.compareElement(btn, getButtonImageName());
-        assert.isTrue(result);
-
-        await btn.tap();
-        assert.equal(await btn.text(), 1);
+        const btnZero = await driver.findElementByText("0");
+        await btnZero.tap();
 
+        // In iOS, the `automationText` property applies on both `name` and `label`:
+        // https://github.com/NativeScript/NativeScript/issues/3150
+        // <XCUIElementTypeButton type="XCUIElementTypeButton" name="0" label="0" enabled="true" visible="true" x="132" y="395" width="111" height="110"/>
+        // <XCUIElementTypeButton type="XCUIElementTypeButton" name="btn" label="btn" enabled="true" visible="true" x="132" y="395" width="111" height="110"/>
+        const btnOne = await driver.findElementByText("1");
         await driver.navBack();
     });
 
@@ -63,12 +63,10 @@ describe("sample scenario", () => {
     for (let styleType in styleTypes) {
         it(`should find an element with ${styleType} style applied`, async function () {
             const element = await driver.findElementByText(styleTypes[styleType]);
-            const result = await driver.compareElement(element, getPlatformImageName());
+            const result = await driver.compareElement(element, "style");
             assert.isTrue(result);
         });
     }
 
-    const getButtonImageName = () => { return driver.isAndroid ? "btnAndroid" : "btnIOS"; }
-    const getPlatformImageName = () => { return driver.isAndroid ? "styleAndroid" : "styleIOS"; }
     const getPlatformLabel = async () => { return driver.isAndroid ? await driver.findElementByText("android") : await driver.findElementByText("ios"); }
 });