allow setting ios sdk version in tests with IOS_VERSION env var

coderedhead · Dec 19, 2013 · 0385611 · 0385611
1 parent 321b161
commit 0385611
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bin/test.sh b/bin/test.sh
@@ -68,14 +68,14 @@ if $ios_only || $all_tests; then
     else
         echo "Did not find /Applications/Xcode-6.1.app, using default"
     fi
-    time $appium_mocha $ios_testfile
+    IOS_VERSION=6.1 time $appium_mocha $ios_testfile
 fi
 
 if $ios7_only || $all_tests; then
     echo "RUNNING IOS 7.0 TESTS"
     echo "---------------------"
     ios7_testfile="./test/functional/_joined/ios7.js"
-    ios7_dirs="testapp uicatalog webview iwebview"
+    ios7_dirs="testapp safari uicatalog webview iwebview"
     join_testfiles ios7 $ios7_testfile $ios7_dirs
     if test -d /Applications/Xcode-7.0.app; then
         echo "Found Xcode for iOS 7.0, switching to it"
@@ -84,7 +84,7 @@ if $ios7_only || $all_tests; then
     else
         echo "Did not find /Applications/Xcode-7.0.app, using default"
     fi
-    time $appium_mocha $ios7_testfile
+    IOS_VERSION=7.0 time $appium_mocha $ios7_testfile
 fi
 
 if $did_switch_xcode; then

diff --git a/test/helpers/driverblock.js b/test/helpers/driverblock.js
@@ -100,7 +100,7 @@ var describeForSafari = function() {
       , app: 'safari'
       , device: 'iPhone Simulator'
       , platform: 'Mac'
-      , version: "6.1"
+      , version: process.env.IOS_VERSION || "6.1"
     };
     return describeWithDriver(desc, tests, host, port, caps, extraCaps, undefined, onlyify);
   };