From 038561117d645faccc4a672c9c6614df1b0fd209 Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Wed, 18 Dec 2013 16:55:36 -0800
Subject: [PATCH] allow setting ios sdk version in tests with IOS_VERSION env
 var

---
 bin/test.sh                 | 6 +++---
 test/helpers/driverblock.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/test.sh b/bin/test.sh
index 71a90b8d8c1..18dd6cab830 100755
--- 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
index c61feaff6dc..f706d96bcd6 100644
--- 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);
   };