calabash-cucumber 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e84d4389afc2bd91cbdba73ecbee008b9e3bf89d
-  data.tar.gz: 221280823e7a79963e87dc3c429eab6480f1e2f6
+  metadata.gz: c76734ed962d6499a9320be6098ff8fc9bd2a00e
+  data.tar.gz: 5899f941d20500625327f94c9070f2bfe4db1573
 SHA512:
-  metadata.gz: 64384eb9d28415ac608f3e840159e8c051d6be5b11ece9e85b9a983aed8dfb5a9209d2ac7c2e873a6728cc882e74ca59a06b2da57ea921893af2fdb5e299dbff
-  data.tar.gz: cf001fb580c891bfbe8e6c1789ad9232d5e221b93e1d4caff370e9f25c7f849a4125d16e58f1e2829b4a332f50509d60b04bc588da042a5f0287e8c62fae567e
+  metadata.gz: b12531775965c0f235935bbbd35bd81f95dc56a46102b12de4139781cea0cc1a9392f6dd1b8803972484668797d49b4c900fce3ea9ed8e618581e5dd2783ed72
+  data.tar.gz: a65e9bf5bfb413bb127a1f8e375a72ae38575e448a1c2ec68067749cb671875c8c75769a2d588b65dffe5dfb3ebbb42ad28035e2497bdab640b1f125e24e821f

data/lib/calabash-cucumber/environment_helpers.rb

@@ -143,6 +143,21 @@ module Calabash
         RunLoop::Version.new(_default_device_or_create.ios_version)
       end
 
+      # The screen dimensions of the device under test.
+      #
+      # This is a hash of form:
+      #  {
+      #    :sample => 1,
+      #    :height => 1334,
+      #    :width => 750,
+      #    :scale" => 2
+      #  }
+      # @raise [RuntimeError] If the server cannot be reached.
+      # @return [RunLoop::Version] The version of the iOS running on the device.
+      def screen_dimensions
+        _default_device_or_create.screen_dimensions
+      end
+
       # Is the device under test running iOS 5?
       #
       # @note

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -6,6 +6,18 @@ require 'calabash-cucumber/utils/logging'
 
 module Calabash
   module Cucumber
+
+
+    # Raised when there is a problem involving a keyboard mode.  There are
+    # three keyboard modes:  docked, split, and undocked.
+    #
+    # All iPads support these keyboard modes, but the user can disable them
+    # in Settings.app.
+    #
+    # The iPhone 6+ family also supports keyboard modes, but Calabash does
+    # support keyboard modes on these devices.
+    class KeyboardModeError < StandardError; ; end
+
     # Collection of methods for interacting with the keyboard.
     #
     # We've gone to great lengths to provide the fastest keyboard entry possible.
@@ -80,36 +92,23 @@ module Calabash
       # @return [Boolean] if a keyboard is visible and docked.
       def docked_keyboard_visible?
         res = query(_qstr_for_keyboard).first
+
         return false if res.nil?
 
         return true if device_family_iphone?
 
-        rect = res['rect']
-        o = status_bar_orientation.to_sym
-        case o
-          when :left
-            if ios8?
-              rect['center_x'] == 512 and rect['center_y'] == 592
-            else
-              rect['center_x'] == 592 and rect['center_y'] == 512
-            end
-          when :right
-            if ios8?
-              rect['center_x'] == 512 and rect['center_y'] == 592
-            else
-              rect['center_x'] == 176 and rect['center_y'] == 512
-            end
-          when :up
-            if ios8?
-              rect['center_x'] == 384 and rect['center_y'] == 892
-            else
-              rect['center_x'] == 384 and rect['center_y'] == 132
-            end
-          when :down
-              rect['center_x'] == 384 and rect['center_y'] == 892
-          else
-            false
+        orientation = status_bar_orientation.to_sym
+        keyboard_height = res['rect']['height']
+        keyboard_y = res['rect']['y']
+        scale = screen_dimensions[:scale]
+
+        if orientation == :left || orientation == :right
+          screen_height = screen_dimensions[:width]/scale
+        else
+          screen_height = screen_dimensions[:height]/scale
         end
+
+        screen_height - keyboard_height == keyboard_y
       end
 
       # Returns true if an undocked keyboard is visible.
@@ -593,10 +592,6 @@ module Calabash
         res = send_uia_command({:command => "#{_query_uia_hide_keyboard_button}.rect()"})
         origin = res['value']['origin']
         {:x => origin['x'], :y => origin['y']}
-
-        # this did not work.
-        #size = res['value']['size']
-        #{:x => (origin['x']  (size['width']/2)), :y => (origin['y']  (size['height']/2))}
       end
 
       # @!visibility private
@@ -700,8 +695,10 @@ module Calabash
           # there are 10 pt btw the key and the popup and each row is 50 pt
           # NB: no amount of offsetting seems to allow touching the top row
           #     when the keyboard is split
+
+          x_offset = 40
           y_offset = 10 + 50 + 25
-          end_pt = {:x => (start_pt[:x] - 40), :y => (start_pt[:y] - y_offset)}
+          end_pt = {:x => (start_pt[:x] - x_offset), :y => (start_pt[:y] - y_offset)}
           uia_pan_offset(start_pt, end_pt, {:duration => 1.0})
         else
           pan(_query_for_keyboard_mode_key, nil, {})
@@ -726,15 +723,23 @@ module Calabash
         return if device_family_iphone?
 
         mode = ipad_keyboard_mode
-        case mode
-          when :split then
-            _touch_bottom_keyboard_mode_row
-          when :undocked then
-            _touch_top_keyboard_mode_row
-          when :docked then
-            # already docked
-          else
-          screenshot_and_raise "expected '#{mode}' to be one of #{_ipad_keyboard_modes}"
+
+        return if mode == :docked
+
+        if ios9?
+          raise KeyboardModeError,
+                'Changing keyboard modes is not supported on iOS 9'
+        else
+          case mode
+            when :split then
+              _touch_bottom_keyboard_mode_row
+            when :undocked then
+              _touch_top_keyboard_mode_row
+            when :docked then
+              # already docked
+            else
+              screenshot_and_raise "expected '#{mode}' to be one of #{_ipad_keyboard_modes}"
+          end
         end
 
         begin
@@ -748,7 +753,6 @@ module Calabash
         end
       end
 
-
       # Ensures that the iPad keyboard is undocked.
       #
       # Undocked means the keyboard is floating in the middle of the view.
@@ -762,35 +766,42 @@ module Calabash
       # @raise [RuntimeError] if there is no visible keyboard
       # @raise [RuntimeError] an undocked keyboard was not achieved
       def ensure_undocked_keyboard
-        wait_for_keyboard()
+        wait_for_keyboard
 
         return if device_family_iphone?
 
         mode = ipad_keyboard_mode
-        case mode
-          when :split then
-            # keep these condition separate because even though they do the same
-            # thing, the else condition is a hack
-            if ios5?
-              # iOS 5 has no 'Merge' feature in split keyboard, so dock first then
-              # undock from docked mode
-              _touch_bottom_keyboard_mode_row
-              _wait_for_keyboard_in_mode(:docked)
+
+        return if mode == :undocked
+
+        if ios9?
+          raise KeyboardModeError,
+                'Changing keyboard modes is not supported on iOS 9'
+        else
+          case mode
+            when :split then
+              # keep these condition separate because even though they do the same
+              # thing, the else condition is a hack
+              if ios5?
+                # iOS 5 has no 'Merge' feature in split keyboard, so dock first then
+                # undock from docked mode
+                _touch_bottom_keyboard_mode_row
+                _wait_for_keyboard_in_mode(:docked)
+              else
+                # in iOS > 5, it seems to be impossible consistently touch the
+                # the top keyboard mode popup button, so we punt
+                _touch_bottom_keyboard_mode_row
+                _wait_for_keyboard_in_mode(:docked)
+              end
+              _touch_top_keyboard_mode_row
+            when :undocked then
+              # already undocked
+            when :docked then
+              _touch_top_keyboard_mode_row
             else
-              # in iOS > 5, it seems to be impossible consistently touch the
-              # the top keyboard mode popup button, so we punt
-              _touch_bottom_keyboard_mode_row
-              _wait_for_keyboard_in_mode(:docked)
-            end
-            _touch_top_keyboard_mode_row
-          when :undocked then
-            # already undocked
-          when :docked then
-            _touch_top_keyboard_mode_row
-          else
-            screenshot_and_raise "expected '#{mode}' to be one of #{_ipad_keyboard_modes}"
+              screenshot_and_raise "expected '#{mode}' to be one of #{_ipad_keyboard_modes}"
+          end
         end
-
         _wait_for_keyboard_in_mode(:undocked)
       end
 
@@ -814,17 +825,24 @@ module Calabash
         return if device_family_iphone?
 
         mode = ipad_keyboard_mode
-        case mode
-          when :split then
-            # already split
-          when :undocked then
-            _touch_bottom_keyboard_mode_row
-          when :docked then
-            _touch_bottom_keyboard_mode_row
-          else
-            screenshot_and_raise "expected '#{mode}' to be one of #{_ipad_keyboard_modes}"
-        end
 
+        return if mode == :split
+
+        if ios9?
+          raise KeyboardModeError,
+                'Changing keyboard modes is not supported on iOS 9'
+        else
+          case mode
+            when :split then
+              # already split
+            when :undocked then
+              _touch_bottom_keyboard_mode_row
+            when :docked then
+              _touch_bottom_keyboard_mode_row
+            else
+              screenshot_and_raise "expected '#{mode}' to be one of #{_ipad_keyboard_modes}"
+          end
+        end
         _wait_for_keyboard_in_mode(:split)
       end
 

data/lib/calabash-cucumber/launcher.rb

@@ -277,16 +277,16 @@ class Calabash::Cucumber::Launcher
     merged_opts = default_opts.merge opts
 
     sim_control = opts.fetch(:sim_control, RunLoop::SimControl.new)
+    xcode = sim_control.xcode
+
     if sim_control.xcode_version_gte_6?
       default_sim = RunLoop::Core.default_simulator(xcode)
       name_or_udid = merged_opts[:udid] || ENV['DEVICE_TARGET'] || default_sim
 
-      target_simulator = nil
-      sim_control.simulators.each do |device|
-        instruments_launch_name = "#{device.name} (#{device.version.to_s} Simulator)"
-        if instruments_launch_name == name_or_udid or device.udid == name_or_udid
-          target_simulator = device
-        end
+      target_simulator = sim_control.simulators.find do |sim|
+        [name_or_udid == sim.instruments_identifier(xcode),
+         name_or_udid == sim.udid,
+         name_or_udid == sim.name].any?
       end
 
       if target_simulator.nil?

data/lib/calabash-cucumber/version.rb

@@ -3,7 +3,7 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.16.2'
+    VERSION = '0.16.3'
 
     # @!visibility public
     # The minimum required version of the Calabash embedded server.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Karl Krukow