Access caps from travis env variables (#1001)

* Access caps from travis env variables

* move appium version to config

use JDK 8

force java 8 in travis

force jdk 8 in travis

use jdk switcher to use jdk 8

force JDK 8

force java 8

force jdk 8

install java 8 through brew

* force install

* add wait for tests

Author: SrinivasanTarget

.travis.yml

@@ -1,17 +1,19 @@
-language: java
-
 sudo: required
 
 matrix:
   include:
     - language: java
       install: true
+      jdk:
+        - $jdkVersion
       os: osx
-      osx_image: xcode9.3
+      osx_image: $xcodeVersion
       before_install:
-        - brew update
-        - brew outdated xctool || brew upgrade xctool
-        - npm install -g appium
+        - brew tap caskroom/versions
+        - brew cask install java8
+        - export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
+        - java -version
+        - npm install -g $appiumVersion
       script:
         - ./gradlew clean build xcuiTest -x test -x signArchives
 #    - language: android

src/test/java/io/appium/java_client/ios/AppIOSTest.java

@@ -27,9 +27,8 @@ public static void beforeClass() throws UnknownHostException, MalformedURLExcept
         File appDir = new File("src/test/java/io/appium/java_client");
         File app = new File(appDir, "TestApp.app.zip");
         DesiredCapabilities capabilities = new DesiredCapabilities();
-        capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
-        capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "11.3");
-        capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone 8");
+        capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION);
+        capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, DEVICE_NAME);
         capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.IOS_XCUI_TEST);
         //sometimes environment has performance problems
         capabilities.setCapability(IOSMobileCapabilityType.LAUNCH_TIMEOUT, 500000);

src/test/java/io/appium/java_client/ios/BaseIOSTest.java

@@ -16,6 +16,7 @@
 
 package io.appium.java_client.ios;
 
+import io.appium.java_client.remote.MobileBrowserType;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import io.appium.java_client.service.local.AppiumServiceBuilder;
 import org.junit.AfterClass;
@@ -28,6 +29,13 @@ public class BaseIOSTest {
     protected static AppiumDriverLocalService service;
     protected static IOSDriver<IOSElement> driver;
     protected static final int PORT = 4723;
+    protected static final String DEVICE_NAME = System.getenv("deviceName") != null
+            ? System.getenv("deviceName") : "iPhone X";
+    protected static final String PLATFORM_VERSION = System.getenv("platformVersion") != null
+            ? System.getenv("platformVersion") : "11.4";
+    protected static final String BROWSER_NAME = System.getenv("browserName") != null
+            ? System.getenv("browserName") : MobileBrowserType.SAFARI;
+
 
     /**
      * Starts a local server.

src/test/java/io/appium/java_client/ios/BaseIOSWebViewTest.java

@@ -39,11 +39,10 @@ public class BaseIOSWebViewTest extends BaseIOSTest {
         File appDir = new File("src/test/java/io/appium/java_client");
         File app = new File(appDir, "vodqa.zip");
         DesiredCapabilities capabilities = new DesiredCapabilities();
-        capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
-        capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "11.3");
+        capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION);
         //sometimes environment has performance problems
         capabilities.setCapability(IOSMobileCapabilityType.LAUNCH_TIMEOUT, 500000);
-        capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone 8");
+        capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, DEVICE_NAME);
         capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
         driver = new IOSDriver<>(new URL("http://" + ip + ":" + PORT + "/wd/hub"), capabilities);
     }

src/test/java/io/appium/java_client/ios/BaseSafariTest.java

@@ -37,12 +37,12 @@ public class BaseSafariTest extends BaseIOSTest {
         }
 
         DesiredCapabilities capabilities = new DesiredCapabilities();
-        capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "Safari");
+        capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, BROWSER_NAME);
         capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.IOS_XCUI_TEST);
-        capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "11.3");
+        capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, PLATFORM_VERSION);
         //sometimes environment has performance problems
         capabilities.setCapability(IOSMobileCapabilityType.LAUNCH_TIMEOUT, 500000);
-        capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone 8");
+        capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, DEVICE_NAME);
         driver = new IOSDriver<>(new URL("http://" + ip + ":" + PORT + "/wd/hub"), capabilities);
     }
 }

src/test/java/io/appium/java_client/ios/IOSTouchTest.java

@@ -58,7 +58,8 @@ public void touchWithPressureTest() {
     }
 
     @Test public void swipeTest() {
-        MobileElement slider = driver.findElementByClassName("XCUIElementTypeSlider");
+        WebDriverWait webDriverWait = new WebDriverWait(driver, 30);
+        IOSElement slider = webDriverWait.until(driver1 -> driver.findElementByClassName("XCUIElementTypeSlider"));
         Dimension size = slider.getSize();
 
         ElementOption press = element(slider, size.width / 2 + 2, size.height / 2);