Fix: android test - update to api 24

Dimitar Todorov · Dimitar Todorov · commit 87c3388f0404 · 2019-06-04T16:47:32.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -161,7 +161,7 @@ matrix:
       script:
         - npm i -g appium
         - cd demo && npm i
-        - travis_wait travis_retry npm run e2e -- --runType android23 --sauceLab --appPath $ANDROID_PACKAGE_JS
+        - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_JS
     - os: linux
       env:
         - Android="24"
@@ -172,7 +172,7 @@ matrix:
       script:
         - npm i -g appium
         - cd demo-vue && npm i
-        - travis_wait travis_retry npm run e2e -- --runType android23 --sauceLab --appPath $ANDROID_PACKAGE_VUE
+        - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_VUE
     - os: linux
       env:
         - iOS="12.0"
diff --git a/demo-vue/e2e/config/appium.capabilities.json b/demo-vue/e2e/config/appium.capabilities.json
@@ -24,13 +24,17 @@
                 "platformName": "Android",
                 "platformVersion": "7.0",
                 "deviceName": "Android GoogleAPI Emulator",
-                "appium-version": "1.9.1",
+                "appiumVersion": "1.9.1",
                 "noReset": true,
-                "lt": 60000,
-                "newCommandTimeout": 720,
-                "fullReset": false,
-                "idleTimeout": 120,
-                "automationName": "Appium"
+                "app": ""
+        },
+        "android24.local": {
+                "platformName": "Android",
+                "platformVersion": "7.0",
+                "deviceName": "Emulator-Api24-Default",
+                "avd": "Emulator-Api24-Default",
+                "appiumVersion": "1.9.1",
+                "noReset": true
         },
         "sim11iPhone6": {
                 "platformName": "iOS",
diff --git a/demo-vue/e2e/test.e2e.ts b/demo-vue/e2e/test.e2e.ts
@@ -63,6 +63,8 @@ describe("Imagepicker", async function () {
 
             if (isSauceRun && imagesFolder) {
                 await imagesFolder.click();
+                let dcimFolder = await driver.findElementByText("DCIM", SearchOptions.contains);
+                await dcimFolder.click();
                 imagesFolder = await driver.findElementByClassName(driver.locators.image);
                 await imagesFolder.click();
             }
diff --git a/demo/e2e/config/appium.capabilities.json b/demo/e2e/config/appium.capabilities.json
@@ -2,8 +2,8 @@
         "android23.local": {
                 "platformName": "Android",
                 "platformVersion": "6.0",
-                "deviceName": "Emulator_Api23_Default",
-                "avd": "Emulator_Api23_Default",
+                "deviceName": "Emulator-Api23-Default",
+                "avd": "Emulator-Api23-Default",
                 "noReset": true
         },
         "android23": {
@@ -13,6 +13,22 @@
                 "appium-version": "1.7.1",
                 "noReset": true
         },
+        "android24": {
+                "platformName": "Android",
+                "platformVersion": "7.0",
+                "deviceName": "Android GoogleAPI Emulator",
+                "appiumVersion": "1.9.1",
+                "noReset": true,
+                "app": ""
+        },
+        "android24.local": {
+                "platformName": "Android",
+                "platformVersion": "7.0",
+                "deviceName": "Emulator-Api24-Default",
+                "avd": "Emulator-Api24-Default",
+                "appiumVersion": "1.9.1",
+                "noReset": true
+        },
         "android25": {
                 "platformName": "Android",
                 "platformVersion": "7.1",
diff --git a/demo/e2e/test.e2e.ts b/demo/e2e/test.e2e.ts
@@ -64,6 +64,8 @@ describe("Imagepicker", async function () {
 
             if (isSauceRun && imagesFolder) {
                 await imagesFolder.click();
+                let dcimFolder = await driver.findElementByText("DCIM", SearchOptions.contains);
+                await dcimFolder.click();
                 imagesFolder = await driver.findElementByClassName(driver.locators.image);
                 await imagesFolder.click();
             }

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@ describe("Imagepicker", async function () {`
`63`	`63`
`64`	`64`	`if (isSauceRun && imagesFolder) {`
`65`	`65`	`await imagesFolder.click();`
	`66`	`+ let dcimFolder = await driver.findElementByText("DCIM", SearchOptions.contains);`
	`67`	`+ await dcimFolder.click();`
`66`	`68`	`imagesFolder = await driver.findElementByClassName(driver.locators.image);`
`67`	`69`	`await imagesFolder.click();`
`68`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ describe("Imagepicker", async function () {`
`64`	`64`
`65`	`65`	`if (isSauceRun && imagesFolder) {`
`66`	`66`	`await imagesFolder.click();`
	`67`	`+ let dcimFolder = await driver.findElementByText("DCIM", SearchOptions.contains);`
	`68`	`+ await dcimFolder.click();`
`67`	`69`	`imagesFolder = await driver.findElementByClassName(driver.locators.image);`
`68`	`70`	`await imagesFolder.click();`
`69`	`71`	`}`