Merge pull request #882 from zebrunner/develop

2.6.3 rc

lib/units/device/index.js

@@ -54,6 +54,9 @@ module.exports = function(options) {
     .consume(options)
     .catch(function(err) {
       log.fatal('Setup had an error', err.stack)
+      if (err.stack.includes("no service started")) {
+        return lifecycle.graceful(err.stack)
+      }
       lifecycle.fatal()
     })
 }

lib/units/ios-device/plugins/wda.js

@@ -25,6 +25,9 @@ module.exports = syrup.serial()
           wdaClient.rotation({orientation: 'PORTRAIT'}).then(() => {
             iosutil.pressButton.call(wdaClient, message.key)
           })
+          .catch(err => {
+            log.error('Failed to rotate device to : ', rotation, err)
+          })
         }
         // On portait mode -> home button directly
         iosutil.pressButton.call(wdaClient, message.key)
@@ -64,6 +67,12 @@ module.exports = syrup.serial()
       //   wdaClient.openUrl({url: 'https://www.google.com'})
       // })
       .on(wire.RotateMessage, (channel, message) => {
+
+        // #875 Ignore rotation operation while device is rotating
+        if (wdaClient.isRotating) {
+          return
+        }
+
         const rotation = iosutil.degreesToOrientation(message.rotation)
         wdaClient.rotation({orientation: rotation})
           .then(() => {

lib/units/ios-device/plugins/wda/WdaClient.js

@@ -31,6 +31,7 @@ module.exports = syrup.serial()
       typeKeyDelay: 250,
       upperCase: false,
       isSwiping: false,
+      isRotating: false,
 
       startSession: function() {
         log.info('verifying wda session status...')
@@ -459,10 +460,10 @@ module.exports = syrup.serial()
           uri: `${options.storageUrl}api/v1/devices/${options.serial}/size`,
         })
           .then((windowSizeResponse) => {
-              let {height, width, scale} = JSON.parse(windowSizeResponse)
+              let {dbHeight, dbWidth, dbScale} = JSON.parse(windowSizeResponse)
 
               // First device session 
-              if (!height || !width || !scale) {
+              if (!dbHeight || !dbWidth || !dbScale) {
                 return this.handleRequest({
                   method: 'GET',
                   uri: `${this.baseUrl}/session/${this.sessionId}/window/size`,
@@ -500,9 +501,9 @@ module.exports = syrup.serial()
               } else {
                 log.info('Reusing device size/scale')
                 if (this.orientation === 'PORTRAIT') {
-                  this.deviceSize = { height: height /= scale, width: width /= scale }  
+                  this.deviceSize = { height: dbHeight /= dbScale, width: dbWidth /= dbScale }  
                 } else if (this.orientation === 'LANDSCAPE') {
-                  this.deviceSize = { height: width /= scale, width: height /= scale }
+                  this.deviceSize = { height: dbWidth /= dbScale, width: dbHeight /= dbScale }
                 }
                 return this.deviceSize
               }
@@ -566,6 +567,8 @@ module.exports = syrup.serial()
       rotation: function(params) {
         this.orientation = params.orientation
 
+        this.isRotating = true
+
         return this.handleRequest({
           method: 'POST',
           uri: `${this.baseUrl}/session/${this.sessionId}/orientation`,
@@ -585,6 +588,8 @@ module.exports = syrup.serial()
               rotationDegrees
             ))
           ])
+
+          this.isRotating = false
         })
       },
       batteryIosEvent: function() {

lib/units/provider/index.js

@@ -302,7 +302,7 @@ module.exports = function(options) {
                   7
                 ))
               ])
-              return Promise.delay(3000).then(lifecycle.graceful(err))
+              return Promise.delay(3000).then(lifecycle.fatal(err))
             }
           })
       }