calabash-cucumber 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 897651c4a4fa6614afc67e03db8ef2e6765460f8
-  data.tar.gz: a99ac89d631f74da261382d01be1280e09e28a8d
+  metadata.gz: 94acd1355fba54a970cdc7586117d81a3e69bbc6
+  data.tar.gz: 45cb7d87be59441af30710916bf5979294d578a2
 SHA512:
-  metadata.gz: acbdeaff512e94a5dbf62756e684e3bec5cdca1f664c98aca2938dc937b1d03453c61afa8f9989aab30ba91efdea587cdcf088ded1f055d6aa8350d2112ea263
-  data.tar.gz: b55621291aecd6e071f628509e1ffe75f878ac1bd222493bfb8e53bb4832bf38393473df00d4c2706234ae730023314dbbaf9e9ff7bc77d9dd8f60f6a447f2da
+  metadata.gz: 55b4aa00dbb8fa1ea0c9ab585b51166c8114a2e33f91c9ec8327aa8a8f733f5265229d5fbe6aacd85ee7773b138c60cf417d795f76311b32677555b5dac307f8
+  data.tar.gz: f0130e5b08f8ff98bd78a245ae6a85859678d80fa1707ff46ba620724721591ce71c9b4fffa2d098fc1831d48e9548dfb07ae9caeed721cf3f5166fb4cd65c99

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

@@ -121,7 +121,17 @@ class Calabash::Cucumber::InstrumentsActions
   def normalize_rect_for_orientation!(orientation, rect)
     orientation = orientation.to_sym
     launcher = Calabash::Cucumber::Launcher.launcher
-    screen_size = launcher.device.screen_size
+    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
+    end
+    dimensions = launcher.device.screen_dimensions
+    if dimensions
+      screen_size = {width: dimensions[:width]*dimensions[:sample]/dimensions[:scale],
+                     height: dimensions[:height]*dimensions[:sample]/dimensions[:scale]}
+    else
+      screen_size = launcher.device.screen_size
+    end
     case orientation
       when :right
         cx = rect['center_x']

data/lib/calabash-cucumber/device.rb

@@ -118,6 +118,22 @@ module Calabash
       # @return [String] The udid of this device.
       attr_accessor :udid
 
+      # For Calabash server version > 0.10.2 provides
+      # device specific screen information.
+      #
+      # This is a hash of form:
+      #  {
+      #    :sample => 1,
+      #    :height => 1334,
+      #    :width => 750,
+      #    :scale" => 2
+      #  }
+      #
+      #
+      # @attribute [r] screen_dimensions
+      # @return [Hash] screen dimensions, scale and down/up sampling fraction.
+      attr_reader :screen_dimensions
+
       # Creates a new instance of Device.
       #
       # @see Calabash::Cucumber::Core#server_version
@@ -135,6 +151,13 @@ module Calabash
         @server_version = version_data['version']
         @iphone_app_emulated_on_ipad = version_data['iphone_app_emulated_on_ipad']
         @iphone_4in = version_data['4inch']
+        screen_dimensions = version_data['screen_dimensions']
+        if screen_dimensions
+          @screen_dimensions = {}
+          screen_dimensions.each_pair do |key,val|
+            @screen_dimensions[key.to_sym] = val
+          end
+        end
       end
 
       # Is this device a simulator or physical device?
@@ -224,6 +247,7 @@ module Calabash
       # @return [Hash] representation of the screen size as a hash with keys
       #  `:width` and `:height`
       def screen_size
+        return screen_dimensions if screen_dimensions
         return { :width => 768, :height => 1024 } if ipad?
         return { :width => 320, :height => 568 } if iphone_4in?
         { :width => 320, :height => 480 }

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -386,7 +386,12 @@ module Calabash
       # @raise [RuntimeError] if the text cannot be typed.
       def tap_keyboard_action_key
         if uia_available?
-          uia_type_string '\n', '', false
+          run_loop = Calabash::Cucumber::Launcher.launcher.run_loop
+          if run_loop[:uia_strategy] == :host
+            uia_type_string "\\\\n", '', false
+          else
+            uia_type_string '\n', '', false
+          end
         else
           keyboard_enter_char 'Return'
         end

data/lib/calabash-cucumber/launcher.rb

@@ -629,16 +629,22 @@ class Calabash::Cucumber::Launcher
     else
       target_udid = launch_args[:device_target]
       target_device = nil
-      sim_control.xctools.instruments(:devices).each do |device|
+      devices_connected = sim_control.xctools.instruments(:devices)
+      devices_connected.each do |device|
         if device.udid == target_udid
           target_device = device
           break
         end
       end
-
-      # Device could not be found; kick the problem down the road.
-      return :preferences if target_device.nil?
-
+      if target_device.nil?
+        target_device = devices_connected.first
+        if target_device
+          launch_args[:device_target] = target_device.udid
+        end
+      end
+      unless target_device
+        raise 'No device_target was specified and did not detect a connected device. Set a device_target option in the relaunch method.'
+      end
       # Preferences strategy works for iOS < 8.0, but not for iOS >= 8.0.
       if target_device.version < RunLoop::Version.new('8.0')
         :preferences

data/lib/calabash-cucumber/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-05 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.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS