calabash 2.0.0.pre1 → 2.0.0.prelegacy2

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,7 +19,7 @@ module Calabash
       include Calabash::IOS::UIAKeyboardMixin
       include Calabash::IOS::TextMixin
       include Calabash::IOS::UIAMixin
-
+      include Calabash::IOS::IPadMixin
       include Calabash::IOS::GesturesMixin
 
       attr_reader :run_loop
@@ -78,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
@@ -339,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,
@@ -367,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
 
@@ -468,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
@@ -571,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
@@ -599,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
@@ -615,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}"
@@ -635,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

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

@@ -0,0 +1,253 @@
+module Calabash
+  module IOS
+    # @!visibility private
+    # Contains methods for interacting with the iPad.
+    module IPadMixin
+
+      # @!visibility private
+      # Provides methods to interact with the 1x and 2x buttons that appear
+      # when an iPhone-only app is emulated on an iPad.  Calabash cannot
+      # interact with these apps in 2x mode because the touch coordinates
+      # cannot be reliably translated from normal iPhone dimensions to the
+      # emulated dimensions.
+      #
+      # On iOS < 7, an app _remembered_ its last 1x/2x scale so when it
+      # reopened the previous scale would be the same as when it closed.  This
+      # meant you could manually set the scale once to 1x and never have to
+      # interact with the scale button again.
+      #
+      # On iOS > 7, the default behavior is that all emulated apps open at 2x
+      # regardless of their previous scale.
+      #
+      # @note In order to use this class, you must allow Calabash to launch
+      #  your app with instruments.
+      class Emulation
+
+        # @!visibility private
+        #
+        # Maintainers:  when adding a localization, please notice that
+        # the keys and values are semantically reversed.
+        #
+        # you should read the hash as:
+        #
+        # ```
+        # :emulated_1x <= what button is showing when the app is emulated at 2X?
+        # :emulated_2x <= what button is showing when the app is emulated at 1X?
+        # ```
+        #
+        # @todo Once we have localizations wired up, we can use these keys
+        #
+        # These pull requests describe how to find a key/value pairs from the
+        # on-disk accessibility bundles for _keyboards_ but we can use the same
+        # strategy to look up the Zoom button localizations.
+        #
+        # * https://github.com/calabash/run_loop/pull/197
+        # * https://github.com/calabash/calabash-ios-server/pull/221
+        #
+        #
+        #  fullscreen.zoom => 2x => 'Switch to full screen mode'
+        #  normal.zoom => 1x => 'Switch to normal mode'
+        #
+        #  # We will still need query windows.
+        #  uia("UIATarget.localTarget().frontMostApp().windows()[2].elements()[0].label()")
+        IPAD_1X_2X_BUTTON_LABELS = {
+              :en => {:emulated_1x => '2X',
+                      :emulated_2x => '1X'}
+        }
+
+        # @!visibility private
+        # @!attribute [r] scale
+        # The current 1X or 2X scale represented as a Symbol.
+        #
+        # @return [Symbol] Returns this emulation's scale.  Will be one of
+        # `{:emulated_1x | :emulated_2x}`.
+        attr_reader :scale
+
+        # @!visibility private
+        # @!attribute [r] lang_code
+        # The Apple compatible language code for determining the accessibility
+        # label of the 1X and 2X buttons.
+        #
+        # @return [Symbol] Returns the language code of this emulation.
+        attr_reader :lang_code
+
+        # @!visibility private
+        # @!attribute [r] device
+        # A handle on the default device.
+        attr_reader :device
+
+        # @!visibility private
+        # A private instance variable for storing this emulation's 1X/2X button
+        # names.  The value will be set at runtime based on the language code
+        # that is passed the initializer.
+        @button_names_hash = nil
+
+        # @!visibility private
+        # Creates a new Emulation.
+        # @param [Symbol] lang_code an Apple compatible language code
+        # @return [Emulation] Returns an emulation that is ready for action!
+        def initialize (device, lang_code=:en)
+          @button_names_hash = IPAD_1X_2X_BUTTON_LABELS[lang_code]
+          if @button_names_hash.nil?
+            raise "could not find 1X/2X buttons for language code '#{lang_code}'"
+          end
+
+          @device = device
+          @lang_code = lang_code
+          @scale = _internal_ipad_emulation_scale
+        end
+
+        # @!visibility private
+        def tap_ipad_scale_button
+          key = @scale
+          name = @button_names_hash[key]
+
+          query_args =
+          [
+               [
+                 :view, {:marked => "#{name}"}
+               ]
+          ]
+
+          device.uia_query_then_make_javascript_calls(:queryElWindows, query_args, :tap)
+        end
+
+        private
+
+        # @!visibility private
+        def _internal_ipad_emulation_scale
+          hash = @button_names_hash
+          val = nil
+          hash.values.each do |button_name|
+            query_args =
+                  [
+                        :view, {:marked => button_name}
+                  ]
+
+            button_exists = device.uia_serialize_and_call(:queryElWindows,
+                                                          query_args)
+            if button_exists
+              result = device.uia_query_then_make_javascript_calls(:queryElWindows,
+                                                                   [query_args],
+                                                                   :name)
+              if result == button_name
+                val = button_name
+                break
+              end
+            end
+          end
+
+          if val.nil?
+            raise "Could not find iPad scale button with '#{hash.values}'"
+          end
+
+          if val == hash[:emulated_1x]
+            :emulated_1x
+          elsif val == hash[:emulated_2x]
+            :emulated_2x
+          else
+            raise "Unrecognized emulation scale '#{val}'"
+          end
+        end
+      end
+
+      # @!visibility private
+      # Ensures that iPhone apps emulated on an iPad are displayed at scale.
+      #
+      # @note It is recommended that clients call this `ensure_ipad_emulation_1x`
+      #  instead of this method.
+      #
+      # @note If this is not an iPhone app emulated on an iPad, then calling
+      #  this method has no effect.
+      #
+      # @note In order to use this method, you must allow Calabash to launch
+      #  your app with instruments.
+      #
+      # Starting in iOS 7, iPhone apps emulated on the iPad always launch at 2x.
+      # calabash cannot currently interact with such apps in 2x mode (trust us,
+      # we've tried).
+      #
+      # @see #ensure_ipad_emulation_1x
+      #
+      # @param [Symbol] scale the desired scale - must be `:emulated_1x` or
+      #  `:emulated_2x`
+      #
+      # @param [Hash] opts optional arguments to control the interaction with
+      #  the 1X/2X buttons
+      #
+      # @option opts [Symbol] :lang_code (:en) an Apple compatible
+      #  language code
+      # @option opts [Symbol] :wait_after_touch (0.4) how long to
+      #  wait _after_ the scale button is touched
+      #
+      # @return [void]
+      #
+      # @raise [RuntimeError] If the app was not launched with instruments.
+      # @raise [RuntimeError] If an invalid `scale` is passed.
+      # @raise [RuntimeError] If an unknown language code is passed.
+      # @raise [RuntimeError] If the scale button cannot be touched.
+      def ensure_ipad_emulation_scale(scale, opts={})
+        return unless iphone_app_emulated_on_ipad?
+
+        allowed = [:emulated_1x, :emulated_2x]
+        unless allowed.include?(scale)
+          raise "Scale '#{scale}' is not one of '#{allowed}' allowed args"
+        end
+
+        default_opts = {:lang_code => :en,
+                        :wait_after_touch => 0.4}
+        merged_opts = default_opts.merge(opts)
+
+        obj = Emulation.new(self, merged_opts[:lang_code])
+
+        actual_scale = obj.scale
+
+        if actual_scale != scale
+          obj.tap_ipad_scale_button
+        end
+
+        sleep(merged_opts[:wait_after_touch])
+      end
+
+      # @!visibility private
+      # Ensures that iPhone apps emulated on an iPad are displayed at `1X`.
+      #
+      # @note If this is not an iPhone app emulated on an iPad, then calling
+      #  this method has no effect.
+      #
+      # @note In order to use this method, you must allow Calabash to launch
+      #  your app with instruments.
+      #
+      # Starting in iOS 7, iPhone apps emulated on the iPad always launch at 2x.
+      # calabash cannot currently interact with such apps in 2x mode (trust us,
+      # we've tried).
+      #
+      # @param [Hash] opts optional arguments to control the interaction with
+      #  the 1X/2X buttons
+      #
+      # @option opts [Symbol] :lang_code (:en) an Apple compatible
+      #  language code
+      # @option opts [Symbol] :wait_after_touch (0.4) how long to
+      #  wait _after_ the scale button is touched
+      #
+      # @return [void]
+      #
+      # @raise [RuntimeError] If the app was not launched with instruments.
+      # @raise [RuntimeError] If an unknown language code is passed.
+      # @raise [RuntimeError] If the scale button cannot be touched.
+      def ensure_ipad_emulation_1x(opts={})
+        ensure_ipad_emulation_scale(:emulated_1x, opts)
+      end
+
+      private
+      # @!visibility private
+      # Ensures iPhone apps running on an iPad are emulated at 2X
+      #
+      # You should never need to call this function - Calabash cannot interact
+      # with iPhone apps emulated on the iPad in 2x mode.
+      def _ensure_ipad_emulation_2x(opts={})
+        ensure_ipad_emulation_scale(:emulated_2x, opts)
+      end
+    end
+  end
+end

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

@@ -110,6 +110,7 @@ module Calabash
         end.call(self)
       end
 
+      # @!visibility private
       def query_for_keyboard
         keyboard_waiter.query(KEYBOARD_QUERY)
       end
@@ -120,6 +121,7 @@ module Calabash
         keyboard_waiter.query(KEYBOARD_KEY_QUERY)
       end
 
+      # @!visibility private
       def query_for_text_of_first_responder(query)
         result = keyboard_waiter.query("#{query} isFirstResponder:1", :text)
         if result.empty?

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

@@ -4,6 +4,7 @@ module Calabash
     # @!visibility private
     module RotationMixin
 
+      # @!visibility private
       def rotate(direction)
         # If we are in the console, we want to be able to rotate without
         # calling start_app.  However, if the Device in the console has not

data/lib/calabash/ios/device/routes/condition_route_mixin.rb

@@ -5,6 +5,7 @@ module Calabash
       # @!visibility private
       module ConditionRouteMixin
 
+        # @!visibility private
         def condition_route(condition, timeout, query)
           request = make_condition_request(condition, timeout, query)
           response = route_post_request(request)

data/lib/calabash/ios/device/routes/map_route_mixin.rb

@@ -5,6 +5,7 @@ module Calabash
       # @!visibility private
       module MapRouteMixin
 
+        # @!visibility private
         def map_route(query, method_name, *method_args)
           request = make_map_request(query, method_name, *method_args)
           response = route_post_request(request)

data/lib/calabash/ios/device/routes/response_parser.rb

@@ -6,6 +6,7 @@ module Calabash
       # @!visibility private
       module ResponseParser
 
+        # @!visibility private
         def parse_response_body(response)
           body = response.body
           begin

data/lib/calabash/ios/device/routes/uia_route_mixin.rb

@@ -9,6 +9,7 @@ module Calabash
         require 'run_loop'
         require 'edn'
 
+        # @!visibility private
         def uia_route(command)
           unless run_loop
             if defined?(IRB)
@@ -49,6 +50,49 @@ module Calabash
           end
         end
 
+        # @!visibility private
+        def uia_serialize_and_call(uia_command, *query_args)
+          command = uia_serialize_command(uia_command, *query_args)
+          result = uia_route(command)
+          result.first
+        end
+
+        # @!visibility private
+        # @todo Extract argument consing and unit test
+        def uia_query_then_make_javascript_calls(uia_command, query_parts, *javascript_parts)
+          if javascript_parts.empty?
+            uia_serialize_and_call(uia_command, *query_parts)
+          else
+            javascript_command = uia_serialize_command(uia_command, *query_parts)
+
+            javascript_args = []
+            javascript_parts.each do |invocation|
+              javascript_args << case invocation
+                when Symbol
+                  "#{invocation}()"
+                when Hash
+                  method = invocation.keys.first
+                  method_args = invocation[method]
+
+                  if method_args.is_a?(Array)
+                    serialized_args = (method_args.map &:to_json).join(',')
+                  else
+                    serialized_args = method_args.to_json
+                  end
+
+                  "#{method}(#{serialized_args})"
+                else
+                  raise Calabash::IOS::RouteError,
+                        "Invalid invocation spec #{invocation}"
+              end
+            end
+            command = "#{javascript_command}.#{javascript_args.join('.')}"
+
+            result = uia_route(command)
+            result.first
+          end
+        end
+
         private
 
         UIA_STRATEGIES = [:preferences, :host, :shared_element]
@@ -159,12 +203,6 @@ module Calabash
           end
         end
 
-        def uia_serialize_and_call(uia_command, *query_args)
-          command = uia_serialize_command(uia_command, *query_args)
-          result = uia_route(command)
-          result.first
-        end
-
         # @todo Verify this is the correct way to escape '\n in string
         def uia_escape_string(string)
           Calabash::Text.escape_single_quotes(string).gsub("\n", "\\\\n")