calabash-cucumber 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9c2af2c421cc8b5591f4f53788ca95ec30c0d8d
-  data.tar.gz: 175d3508a423c054439efccb4f348c55bacacfbc
+  metadata.gz: f4e1515ec07504b838591d799f0882cc36b2c2f9
+  data.tar.gz: 5a4b7ef139d00377932957cdc3fb65ca30e04730
 SHA512:
-  metadata.gz: 4e1d08001d117164b4a8ecb0502b33c1095fdd959b59c262aae6a7f3ca4b53351a04b408f2ca0321a67bc14a034624997cbe2f8d0213f227a3f3e629411865b3
-  data.tar.gz: 0f1c5499d7ecaffb32739e338c031d218d90c28750a7767771c54474587fb41af394b4afe87b7c30d5e22311fcce8c1fa16874f8e5c4eb84f27712c9c792ae59
+  metadata.gz: 807106d6b80c97daa0a92e99732eb21b910b238a94eec7849414a046fd65035772e5f724bae20cf31258e727fdc4e370312a03c9e4bad7405121e32520d53336
+  data.tar.gz: d2a41bca839974a8d143164649b9144f1fd4fa0a669a2ed9a36b4b99d108774bc74fc7d053ff6930d3caaf2fc1ae8fd8a15378567d764cc3ebde550e15a75a5d

data/lib/calabash-cucumber/actions/instruments_actions.rb

@@ -121,17 +121,25 @@ class Calabash::Cucumber::InstrumentsActions
   def normalize_rect_for_orientation!(orientation, rect)
     orientation = orientation.to_sym
     launcher = Calabash::Cucumber::Launcher.launcher
+
+    # Coordinate translations for orientation is handled in the server for iOS 8+
+    # https://developer.apple.com/library/ios/documentation/UIKit/Reference/UICoordinateSpace_protocol/index.html
     if launcher.ios_major_version.to_i >= 8
-      return ## Orientation management changed in iOS 8:
-    #  ## https://developer.apple.com/library/ios/documentation/UIKit/Reference/UICoordinateSpace_protocol/index.html
+      return
     end
-    dimensions = launcher.device.screen_dimensions
-    if dimensions
-      screen_size = {width: dimensions[:width]*dimensions[:sample]/dimensions[:scale],
-                     height: dimensions[:height]*dimensions[:sample]/dimensions[:scale]}
+
+    # We cannot use Device#screen_dimensions here because on iPads the height
+    # and width are the opposite of what we expect.
+    # @todo Move all coordinate/orientation translation into the server.
+    device = launcher.device
+    if device.ipad?
+      screen_size = { :width => 768, :height => 1024 }
+    elsif device.iphone_4in?
+      screen_size = { :width => 320, :height => 568 }
     else
-      screen_size = launcher.device.screen_size
+      screen_size = { :width => 320, :height => 480 }
     end
+
     case orientation
       when :right
         cx = rect['center_x']
@@ -150,5 +158,4 @@ class Calabash::Cucumber::InstrumentsActions
         # no-op by design.
     end
   end
-
-end
+end

data/lib/calabash-cucumber/device.rb

@@ -220,6 +220,12 @@ module Calabash
         version_hash(ios_version)[:major_version]
       end
 
+      # Is this device running iOS 8?
+      # @return [Boolean] true if the major version of the OS is 8
+      def ios8?
+        ios_major_version.eql?('8')
+      end
+
       # Is this device running iOS 7?
       # @return [Boolean] true if the major version of the OS is 7
       def ios7?
@@ -238,15 +244,13 @@ module Calabash
         ios_major_version.eql?('5')
       end
 
-      # The screen size of the device.
+      # @deprecated 0.11.2 Replaced with screen_dimensions.
       #
-      # @note These values are not dynamically computed; they are constants.
-      #
-      # @note These values are for portrait or upside orientations
+      # The screen size of the device.
       #
-      # @return [Hash] representation of the screen size as a hash with keys
-      #  `:width` and `:height`
+      # @return [Hash] representation of the screen size
       def screen_size
+        _deprecated('0.11.2', 'Replaced with screen_dimensions', :warn)
         return screen_dimensions if screen_dimensions
         return { :width => 768, :height => 1024 } if ipad?
         return { :width => 320, :height => 568 } if iphone_4in?

data/lib/calabash-cucumber/environment_helpers.rb

@@ -155,6 +155,18 @@ module Calabash
         _OS_ENV.eql?(_canonical_os_version(:ios7)) || _default_device_or_create().ios7?
       end
 
+      # Is the device under test running iOS 8?
+      #
+      # @note
+      #  **WARNING:** The `OS` env variable has been deprecated and should
+      #  never be set.
+      #
+      # @raise [RuntimeError] if the server cannot be reached
+      # @return [Boolean] true if device under test is running iOS 8
+      def ios8?
+       _default_device_or_create.ios8?
+      end
+
       # Is the app that is being tested an iPhone app emulated on an iPad?
       #
       # @see Calabash::Cucumber::IPad

data/lib/calabash-cucumber/launcher.rb

@@ -961,7 +961,7 @@ class Calabash::Cucumber::Launcher
 
     server_version = nil
     exe_paths.each do |path|
-      server_version_string = `strings "#{path}" | grep -E 'CALABASH VERSION'`.chomp!
+      server_version_string = `xcrun strings "#{path}" | grep -E 'CALABASH VERSION'`.chomp!
       if server_version_string
         server_version = server_version_string.split(' ').last
         break

data/lib/calabash-cucumber/uia.rb

@@ -26,7 +26,13 @@ module Calabash
         case run_loop[:uia_strategy]
           when :preferences
             res = http({:method => :post, :path => 'uia'}, {:command => command}.merge(options))
-            res = JSON.parse(res)
+
+            begin
+              res = JSON.parse(res)
+            rescue TypeError, JSON::ParserError => _
+              raise "Could not parse response '#{res}'; the app has probably crashed"
+            end
+
             if res['outcome'] != 'SUCCESS'
               raise "uia action failed because: #{res['reason']}\n#{res['details']}"
             end
@@ -234,13 +240,32 @@ module Calabash
           indexes = string.enum_for(:scan, /\\/).map { Regexp.last_match.begin(0) }
           indexes.reverse.each { |idx| string = string.insert(idx, '\\') }
         end
-        res = uia_handle_command(:typeString, string, opt_text_before)
-        status = res['status']
-        if status.eql?('error')
-          value = res['value']
-          raise "could not type '#{string}' - '#{value}'"
+        result = uia_handle_command(:typeString, string, opt_text_before)
+
+        # When 'status' == 'success', we get back result['value'].  Sometimes,
+        # the 'value' key is not present in the result - in which case we assume
+        # success without error.
+        return if result.nil?
+
+        # Typing on UIWebViews returns result['value'] => ':nil'.  There might
+        # be other cases where result is _not_ a Hash.
+        return unless result.is_a? Hash
+
+        # If there is no 'status' key, then we assume success.  Syntax errors
+        # should be caught upstream.
+        # https://github.com/calabash/calabash-ios/issues/374
+        return unless result.has_key? 'status'
+
+        status = result['status']
+
+        # If status is not 'error' we punt.  Should never happen.
+        return if status != 'error'
+
+        if result.has_key? 'value'
+          raise "Could not type '#{string}' - UIAutomation returned an error: '#{result['value']}'"
+        else
+          raise "Could not type '#{string}' - UIAutomation returned '#{result}'"
         end
-        status
       end
 
       # @!visibility private
@@ -385,8 +410,6 @@ module Calabash
           s
         end
       end
-
-
     end
   end
 end

data/lib/calabash-cucumber/version.rb

@@ -3,11 +3,11 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.11.1'
+    VERSION = '0.11.2'
 
     # @!visibility public
     # The minimum required version of the calabash.framework or, for Xamarin
     # users, the Calabash component.
-    MIN_SERVER_VERSION = '0.11.1'
+    MIN_SERVER_VERSION = '0.11.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -430,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS