From 6e41a55628f102a31448f6d27e77a5eee25f3c23 Mon Sep 17 00:00:00 2001
From: Darren Hurley <ironsidevsquincy@googlemail.com>
Date: Mon, 3 Aug 2015 11:46:15 +0100
Subject: [PATCH 1/2] use device name for iphone

---
 config/nightwatch.json | 23 ++++-------------------
 tasks/nightwatch.js    |  2 +-
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/config/nightwatch.json b/config/nightwatch.json
index 0f845e3e..5a25e463 100644
--- a/config/nightwatch.json
+++ b/config/nightwatch.json
@@ -122,28 +122,13 @@
         "platform": "OS X 10.9"
       }
     },
-    "iphone8_1": {
+    "iphone6_plus": {
       "desiredCapabilities": {
+        "browserName": "iPhone 6 Plus",
         "platform": "OS X 10.10",
-        "version": "8.1",
+        "version": "8.3",
         "deviceName": "iPhone Simulator",
-        "device-orientation": "portrait"
-      }
-    },
-    "iphone7": {
-      "desiredCapabilities": {
-        "platform": "OS X 10.10",
-        "version": "7.0",
-        "deviceName": "iPhone Simulator",
-        "device-orientation": "portrait"
-      }
-    },
-    "ipad8_0": {
-      "desiredCapabilities": {
-        "platform": "OS X 10.10",
-        "version": "8.0",
-        "deviceName": "iPad Simulator",
-        "device-orientation": "portrait"
+        "deviceOrientation": "portrait"
       }
     },
     "Android_Nexus7HD": {
diff --git a/tasks/nightwatch.js b/tasks/nightwatch.js
index 9dcf850a..c6b2d1b7 100644
--- a/tasks/nightwatch.js
+++ b/tasks/nightwatch.js
@@ -13,7 +13,7 @@ function toStdErr(data) {
 
 module.exports = function(opts) {
 	var test = opts.test;
-	var env = opts.env || 'ie9,ie10,ie11,firefox38,firefox39,chrome42,chrome43,iphone7,Android_Nexus7HD';
+	var env = opts.env || 'ie9,ie10,ie11,firefox38,firefox39,chrome42,chrome43,iphone6_plus,Android_Nexus7HD';
 	var config = opts.config || path.join(__dirname, '..', 'config', 'nightwatch.json');
 	var args = [ '--env', env, '--test', test, '--config', config ];
 

From 2a6f9e4cd3033b2ca5eddee61baa143f293e518d Mon Sep 17 00:00:00 2001
From: Darren Hurley <ironsidevsquincy@googlemail.com>
Date: Mon, 3 Aug 2015 12:04:55 +0100
Subject: [PATCH 2/2] correct device name

---
 config/nightwatch.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/nightwatch.json b/config/nightwatch.json
index 5a25e463..f8da926d 100644
--- a/config/nightwatch.json
+++ b/config/nightwatch.json
@@ -124,10 +124,8 @@
     },
     "iphone6_plus": {
       "desiredCapabilities": {
-        "browserName": "iPhone 6 Plus",
-        "platform": "OS X 10.10",
         "version": "8.3",
-        "deviceName": "iPhone Simulator",
+        "deviceName": "iPhone 6 Plus",
         "deviceOrientation": "portrait"
       }
     },