calabash 1.9.9.pre3 → 2.0.0.prelegacy

data/lib/calabash/ios/defaults.rb

@@ -1,5 +1,6 @@
 module Calabash
   module IOS
+    # Runtime defaults for iOS.
     module Defaults
       # Sets up the default application based on the
       # environment, and the default device based on the default application

data/lib/calabash/ios/device.rb

@@ -18,6 +18,7 @@ module Calabash
     require 'calabash/ios/device/uia_keyboard_mixin'
     require 'calabash/ios/device/text_mixin'
     require 'calabash/ios/device/uia_mixin'
+    require 'calabash/ios/device/ipad_1x_2x_mixin'
     require 'calabash/ios/device/device_implementation'
 
   end

data/lib/calabash/ios/device/device_implementation.rb

@@ -19,11 +19,9 @@ module Calabash
       include Calabash::IOS::UIAKeyboardMixin
       include Calabash::IOS::TextMixin
       include Calabash::IOS::UIAMixin
-
+      include Calabash::IOS::IPadMixin
       include Calabash::IOS::GesturesMixin
 
-      # @todo Should these be public?
-      # @todo If public, document!
       attr_reader :run_loop
       attr_reader :uia_strategy
       attr_reader :start_options
@@ -80,7 +78,7 @@ module Calabash
         identifier = Environment::DEVICE_IDENTIFIER
 
         if identifier.nil?
-          connected_devices = RunLoop::XCTools.new.instruments(:devices)
+          connected_devices = RunLoop::Instruments.new.physical_devices
           if connected_devices.empty?
             raise 'There are no physical devices connected.'
           elsif connected_devices.count > 1
@@ -292,6 +290,13 @@ module Calabash
         runtime_attributes.server_version
       end
 
+      # @!visibility private
+      # A dump of runtime details.
+      def runtime_details
+        expect_runtime_attributes_available(__method__)
+        @runtime_attributes.runtime_info
+      end
+
       # Is this device a simulator?
       # @return [Boolean] Returns true if this device is a simulator.
       def simulator?
@@ -334,6 +339,10 @@ module Calabash
         else
           raise "Invalid application #{application} for iOS platform."
         end
+
+        # @todo Get the language code from the server!
+        ensure_ipad_emulation_1x
+
         {
            :device => self,
            :application => application,
@@ -362,7 +371,7 @@ module Calabash
 
         expect_app_installed_on_simulator(bridge)
 
-        installed_app = Calabash::IOS::Application.new(bridge.fetch_app_dir)
+        installed_app = Calabash::IOS::Application.new(bridge.send(:installed_app_bundle_dir))
         expect_matching_sha1s(installed_app, application)
       end
 
@@ -463,7 +472,7 @@ module Calabash
           bridge = run_loop_bridge(@run_loop_device, application)
 
           if bridge.app_is_installed?
-            installed_app = Calabash::IOS::Application.new(bridge.fetch_app_dir)
+            installed_app = Calabash::IOS::Application.new(bridge.send(:installed_app_bundle_dir))
 
             if installed_app.same_sha1_as?(application)
               true
@@ -566,9 +575,9 @@ module Calabash
       # @!visibility private
       def uninstall_app_on_simulator(application, run_loop_device, bridge)
         begin
-          bridge.uninstall
+          bridge.uninstall_app_and_sandbox
           true
-        rescue e
+        rescue => e
           raise "Could not uninstall #{application.identifier} on #{run_loop_device}: #{e}"
         end
       end
@@ -594,10 +603,11 @@ module Calabash
       end
 
       # @!visibility private
-      # Do not memoize this.  The Bridge initializer does a bunch of work to
+      # Do not memoize this.  The CoreSimulator initializer does a bunch of work to
       # prepare the environment for simctl actions.
       def run_loop_bridge(run_loop_simulator_device, application)
-        RunLoop::Simctl::Bridge.new(run_loop_simulator_device, application.path)
+        run_loop_app = RunLoop::App.new(application.path)
+        RunLoop::CoreSimulator.new(run_loop_simulator_device, run_loop_app)
       end
 
       # @!visibility private
@@ -610,7 +620,7 @@ module Calabash
             bridge = run_loop_bridge
           end
 
-          bridge.uninstall
+          bridge.uninstall_app_and_sandbox
           bridge.install
         rescue StandardError => e
           raise "Could not install #{application} on #{run_loop_device}: #{e}"
@@ -630,8 +640,8 @@ module Calabash
       # @!visibility private
       # Very expensive!
       def Device.fetch_matching_physical_device(udid_or_name)
-        xctools = RunLoop::XCTools.new
-        xctools.instruments(:devices).detect do |device|
+        instruments = RunLoop::Instruments.new
+        instruments.physical_devices.detect do |device|
           device.name == udid_or_name ||
                 device.udid == udid_or_name
         end
@@ -729,11 +739,18 @@ module Calabash
 
       # @!visibility private
       def expect_runtime_attributes_available(method_name)
+
         if runtime_attributes.nil?
-          logger.log("The method '#{method_name}' is not available to IOS::Device until", :info)
-          logger.log('the app has been launched with Calabash start_app.', :info)
-          raise "The method '#{method_name}' can only be called after the app has been launched"
+          begin
+            # Populates the @runtime_attributes
+            wait_for_server_to_start({:timeout => 1.0})
+          rescue Calabash::Device::EnsureTestServerReadyTimeoutError => _
+            logger.log("The method '#{method_name}' is not available to IOS::Device until", :info)
+            logger.log('the app has been launched with Calabash start_app.', :info)
+            raise "The method '#{method_name}' can only be called after the app has been launched"
+          end
         end
+
         true
       end
 

data/lib/calabash/ios/device/gestures_mixin.rb

@@ -1,5 +1,6 @@
 module Calabash
   module IOS
+
     # @!visibility private
     #
     # Gestures should wait for the views involved before performing the
@@ -13,26 +14,117 @@ module Calabash
     # @todo Needs unit tests.
     module GesturesMixin
 
+      # @!visibility private
+      class UIAutomationError < StandardError; end
+
+      # @!visibility private
+      #
+      # Since iOS 7, Apple's UIAutomation API:
+      #
+      #  * dragInsideWithOptions
+      #  * flickInsideWithOptions
+      #
+      # has been broken for iOS Simulators under the following conditions:
+      #
+      #  * View is UIScrollView or UIScrollView subclass
+      #  * View is inside a UIScrollView or UIScrollView subclass
+      #
+      # @todo Check for fix on iOS 9
+      def check_for_broken_uia_automation(query, view, gesture_waiter)
+        # Only broken for simulators.
+        return if Device.default.physical_device?
+
+        conditions = [
+          # All UIScrollViews have content_offset.
+          lambda do
+            content_offset = gesture_waiter.query(query, :contentOffset).first
+            content_offset != '*****'
+          end,
+
+          # If view looks like a table view cell.
+          lambda do
+            view['class'][/TableViewCell/, 0]
+          end,
+
+          # Or a collection view cell.
+          lambda do
+            view['class'][/CollectionViewCell/, 0]
+          end,
+
+          # If view in inside a UITableViewCell.
+          lambda do
+            if query.to_s == '*'
+              # '*' parent UITableViewCell is too broad.
+              false
+            else
+              new_query = "#{query} parent UITableViewCell"
+              !gesture_waiter.query(new_query).empty?
+            end
+          end,
+
+          # Or inside a UICollectionViewCell
+          lambda do
+            if query.to_s == '*'
+              # '*' parent UICollectionViewCell is too broad.
+              false
+            else
+              new_query = "#{query} parent UICollectionViewCell"
+              !gesture_waiter.query(new_query).empty?
+            end
+          end
+        ]
+
+        if conditions.any? { |condition| condition.call }
+          message = [
+                '',
+                "Apple's public UIAutomation API `dragInsideWithOptions` is broken for iOS Simulators >= 7",
+                '',
+                'If you are trying to swipe-to-delete on a simulator, it will only work on a device.',
+                '',
+                'If you are trying to manipulate a table, collection or scroll view, try using the Scroll API.',
+                '  * scroll                    # Scroll in a direction.',
+                '  * scroll_to_row             # Scroll to a row with row / section indexes.',
+                '  * scroll_to_row_with_mark   # Scroll to table row with a mark.',
+                '  * scroll_to_item            # Scroll to collection item with item / section indexes.',
+                '  * scroll_to_item_with_mark  # Scroll to collection item with a mark.',
+                '',
+                'All gestures work on physical devices.'
+          ].map { |msg| Color.red(msg) }.join("\n")
+          raise UIAutomationError, message
+        end
+      end
+
+      # @!visibility private
       def _tap(query, options={})
         view_to_touch = _gesture_waiter.wait_for_view(query, options)
 
-        offset = uia_center_of_view(view_to_touch)
+        rect = view_to_touch['rect']
+        x = rect['x'] + (rect['width'] * (options[:at][:x] / 100.0)).to_i
+        y = rect['y'] + (rect['height'] * (options[:at][:y] / 100.0)).to_i
+
+        offset = coordinate(x, y)
 
         uia_serialize_and_call(:tapOffset, offset, options)
 
         Calabash::QueryResult.create([view_to_touch], query)
       end
 
+      # @!visibility private
       def _double_tap(query, options={})
         view_to_touch = _gesture_waiter.wait_for_view(query, options)
 
-        offset = uia_center_of_view(view_to_touch)
+        rect = view_to_touch['rect']
+        x = rect['x'] + (rect['width'] * (options[:at][:x] / 100.0)).to_i
+        y = rect['y'] + (rect['height'] * (options[:at][:y] / 100.0)).to_i
+
+        offset = coordinate(x, y)
 
         uia_serialize_and_call(:doubleTapOffset, offset, options)
 
         Calabash::QueryResult.create([view_to_touch], query)
       end
 
+      # @!visibility private
       def _long_press(query, options={})
 
         begin
@@ -43,13 +135,18 @@ module Calabash
 
         view_to_touch = _gesture_waiter.wait_for_view(query, options)
 
-        offset = uia_center_of_view(view_to_touch)
+        rect = view_to_touch['rect']
+        x = rect['x'] + (rect['width'] * (options[:at][:x] / 100.0)).to_i
+        y = rect['y'] + (rect['height'] * (options[:at][:y] / 100.0)).to_i
+
+        offset = coordinate(x, y)
 
         uia_serialize_and_call(:touchHoldOffset, options[:duration], offset)
 
         Calabash::QueryResult.create([view_to_touch], query)
       end
 
+      # @!visibility private
       def _pan_between(query_from, query_to, options={})
 
         begin
@@ -72,17 +169,14 @@ module Calabash
         }
       end
 
-      # The default to and from for the pan_* methods are not good for iOS.
+      # @!visibility private
+      # @todo The default to and from for the pan_* methods are not good for iOS.
       #
       # * from: {x: 90, y: 50}
       # *   to: {x: 10, y: 50}
       #
-      # If the view has a UINavigationBar or UITabBar, the defaults will
+      # If the view has a UINavigationBar or UITabBar, the defaults *might*
       # cause vertical gestures to start and/or end on one of these bars.
-      #
-      # dragInsideWithOptions broke in iOS 7, so the condition should really be
-      # `Device.default.simulator? && !Device.ios6?`, but I haven't checked on
-      # iOS 9 yet, so I will leave the condition out.
       def _pan(query, from, to, options={})
 
         begin
@@ -94,66 +188,125 @@ module Calabash
         gesture_waiter = _gesture_waiter
         view_to_pan = gesture_waiter.wait_for_view(query, options)
 
-        # * will never match a UIScrollView or subclass.
-        if Device.default.simulator? && query.to_s != '*'
-          should_raise = false
-
-          content_offset = gesture_waiter.query(query, :contentOffset).first
-          if content_offset != '*****'
-            # Panning on anything with a content offset is broken.
-            should_raise = true
-          elsif view_to_pan['class'][/TableViewCell/, 0]
-            should_raise = true
-          else
-            new_query = "#{query} parent UITableViewCell"
-            should_raise = !gesture_waiter.query(new_query).empty?
-            # TODO: Identify other conditions
-            # TODO: Can we detect UITableViewCells?
-            # The gist is that if the view is a UIScrollView or in a UIScrollView
-            # dragInsideWithOptions does not work
-          end
-
-          if should_raise
-            message = [
-                  '',
-                  "Apple's public UIAutomation API `dragInsideWithOptions` is broken for iOS Simulators >= 7",
-                  '',
-                  'If you are trying to swipe-to-delete on a simulator, it will only work on a device.',
-                  '',
-                  'If you are trying to manipulate a table, collection or scroll view, try using the Scroll API.',
-                  '  * scroll                    # Scroll in a direction.',
-                  '  * scroll_to_row             # Scroll to a row with row / section indexes.',
-                  '  * scroll_to_row_with_mark   # Scroll to table row with a mark.',
-                  '  * scroll_to_item            # Scroll to collection item with item / section indexes.',
-                  '  * scroll_to_item_with_mark  # Scroll to collection item with a mark.',
-                  '',
-                  'All gestures work on physical devices.'
-            ].map { |msg| Color.red(msg) }.join("\n")
-            raise message
-          end
+        begin
+          check_for_broken_uia_automation(query, view_to_pan, gesture_waiter)
+        rescue => e
+          raise "Could not pan with query: #{query}\n#{e.message}"
         end
 
         rect = view_to_pan['rect']
 
         from_x = rect['width'] * (from[:x]/100.0)
         from_y = rect['height'] * (from[:y]/100.0)
-        from_offset = percent(from_x, from_y)
+        from_offset = coordinate(from_x, from_y)
 
         to_x = rect['width'] * (to[:x]/100.0)
         to_y = rect['height'] * (to[:y]/100.0)
-        to_offset = percent(to_x, to_y)
+        to_offset = coordinate(to_x, to_y)
 
         uia_serialize_and_call(:panOffset, from_offset, to_offset)
 
         Calabash::QueryResult.create([view_to_pan], query)
       end
 
+      # @!visibility private
       def pan_screen(view_to_pan, from_offset, to_offset, options)
+        begin
+          _expect_valid_duration(options)
+        rescue ArgumentError => e
+          raise ArgumentError, e
+        end
+
         uia_serialize_and_call(:panOffset, from_offset, to_offset, options)
 
         Calabash::QueryResult.create([view_to_pan], '*')
       end
 
+      # @!visibility private
+      # @todo The default to and from for the screen_* methods are not good for iOS.
+      #
+      # * from: {x: 90, y: 50}
+      # *   to: {x: 10, y: 50}
+      #
+      # If the view has a UINavigationBar or UITabBar, the defaults *might*
+      # cause vertical gestures to start and/or end on one of these bars.
+      def _flick(query, from, to, options)
+        begin
+          _expect_valid_duration(options)
+        rescue ArgumentError => e
+          raise ArgumentError, e
+        end
+
+        gesture_waiter = _gesture_waiter
+        view_to_flick = gesture_waiter.wait_for_view(query, options)
+
+        begin
+          check_for_broken_uia_automation(query, view_to_flick, gesture_waiter)
+        rescue => e
+          raise "Could not flick with query: #{query}\n#{e.message}"
+        end
+
+        rect = view_to_flick['rect']
+
+        from_x = rect['width'] * (from[:x]/100.0)
+        from_y = rect['height'] * (from[:y]/100.0)
+        from_offset = percent(from_x, from_y)
+
+        to_x = rect['width'] * (to[:x]/100.0)
+        to_y = rect['height'] * (to[:y]/100.0)
+        to_offset = percent(to_x, to_y)
+
+        uia_serialize_and_call(:flickOffset, from_offset, to_offset, options)
+
+        Calabash::QueryResult.create([view_to_flick], query)
+      end
+
+      # @!visibility private
+      def flick_screen(view_to_pan, from_offset, to_offset, options)
+        begin
+          _expect_valid_duration(options)
+        rescue ArgumentError => e
+          raise ArgumentError, e
+        end
+
+        uia_serialize_and_call(:flickOffset, from_offset, to_offset, options)
+
+        Calabash::QueryResult.create([view_to_pan], '*')
+      end
+
+      # @!visibility private
+      # @todo The pinch gestures are incredibly coarse grained.
+      #
+      # https://github.com/krukow/calabash-script/commit/fa33550ac7ac4f37da649498becef441d2284cd8
+      def _pinch(direction, query, options={})
+        begin
+          _expect_valid_duration(options)
+        rescue ArgumentError => e
+          raise ArgumentError, e
+        end
+
+        gesture_waiter = _gesture_waiter
+
+        view_to_pinch = gesture_waiter.wait_for_view(query, options)
+        offset = uia_center_of_view(view_to_pinch)
+
+        gesture_direction = direction == :in ? :out : :in
+
+        uia_serialize_and_call(:pinchOffset, gesture_direction, offset, options)
+
+        after = gesture_waiter.query(query)
+        if after.empty?
+          after_result = nil
+        else
+          after_result = after.first
+        end
+
+        {
+              :before => Calabash::QueryResult.create([view_to_pinch], query),
+              :after => Calabash::QueryResult.create([after_result], query)
+        }
+      end
+
       private
 
       # @!visibility private
@@ -189,6 +342,7 @@ module Calabash
         end.call(self)
       end
 
+      # @!visibility private
       def _expect_valid_duration(options)
         duration = options[:duration].to_f
         if duration < 0.5 || duration > 60