calabash-cucumber 0.14.3 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2dcaa1398aadb061fce6ced92b4b390665c467
-  data.tar.gz: 9d51395fc82748addee27a52ba0ca18a911f40d5
+  metadata.gz: 1162678765d96a589e12bdf06d092d2f0eba972a
+  data.tar.gz: 4c68a868778d5fac3f875a2c709c1329e4330791
 SHA512:
-  metadata.gz: 45dd5313852539ff2a58c7d280626ff186050348a3363c9db74126094a42c773cccd1a81eb98bc0d22a7850ae5b63d6b393e34babd4bb8259f27fd7c21d43b54
-  data.tar.gz: f9e63acb09345a0972e74c0e319e22964f292e0349a62076e481546a04981ed199e4a2f55c9425e37fcf86db42013a77f44163b6094eb42dcd1e9e6b1ffcff2b
+  metadata.gz: da411ca25785cad3d76cbc52745708a9af974d1aed3d9d855e0231afb6d21486ec71a9ff9f980bf25c2bdad61742d244695c9f799e763f42f12328c3f82a8335
+  data.tar.gz: 0cca1e98616a717243bb4727e64ce41a2befaecc9f6fc6b54f5421723ff696c53435b42e986daa43a72bb55387f177058233119af367b80989d43cb62ac55c56

data/features-skeleton/support/01_launch.rb

@@ -5,7 +5,7 @@
 #   When running calabash-ios tests at #
 #   www.xamarin.com/test-cloud         #
 #   the  methods invoked by            #
-#   CalabashLauncher are overriden.    #
+#   CalabashLauncher are overridden.   #
 #   It will automatically ensure       #
 #   running on device, installing apps #
 #   etc.                               #

data/lib/calabash-cucumber/core.rb

@@ -336,12 +336,27 @@ module Calabash
       # @option options {Hash} :offset (nil) optional offset to touch point. Offset supports an `:x` and `:y` key
       #   and causes the touch to be offset with `(x,y)` relative to the center (`center + (offset[:x], offset[:y])`).
       # @option options {String} :query (nil) if specified, the swipe will be made relative to this query.
+      # @option options [Symbol] :force (nil) Indicates the force of the swipe.
+      #  Valid values are :strong, :normal, :light.
+      #
       # @return {Array<Hash>,String} array containing the serialized version of the touched view if `options[:query]` is given.
       def swipe(dir, options={})
+        merged_options = options.dup
+
+        # I don't understand why the :status_bar_orientation value is being overwritten
         unless uia_available?
-          options = options.merge(:status_bar_orientation => status_bar_orientation)
+          merged_options[:status_bar_orientation] = status_bar_orientation
+        end
+
+        force = merged_options[:force]
+        if force
+          unless [:light, :strong, :normal].include?(force)
+            raise ArgumentError,
+              "Expected :force option '#{force}' to be :light, :strong, or :normal"
+          end
         end
-        launcher.actions.swipe(dir.to_sym, options)
+
+        launcher.actions.swipe(dir.to_sym, merged_options)
       end
 
 
@@ -393,9 +408,17 @@ module Calabash
       # @note this is implemented by calling the Obj-C `setContentOffset:animated:` method and can do things users cant.
       #
       # @param {String} uiquery query describing view scroll (should be  UIScrollView or a web view).
+      # @param [Symbol] direction The direction to scroll. Valid directions are:
+      #   :up, :down, :left, and :right
       def scroll(uiquery, direction)
-        views_touched=map(uiquery, :scroll, direction)
-        msg = "could not find view to scroll: '#{uiquery}', args: #{direction}"
+        allowed_directions = [:up, :down, :left, :right]
+        dir_symbol = direction.to_sym
+        unless allowed_directions.include?(dir_symbol)
+          raise ArgumentError, "Expected '#{direction} to be one of #{allowed_directions}"
+        end
+
+        views_touched=map(uiquery, :scroll, dir_symbol)
+        msg = "could not find view to scroll: '#{uiquery}', args: #{dir_symbol}"
         assert_map_results(views_touched, msg)
         views_touched
       end
@@ -790,18 +813,33 @@ module Calabash
       #   backdoor("calabashBackdoor:", '')
       # @example
       #   backdoor("calabashBackdoor:", {example:'param'})
-      # @param {String} sel the selector to perform on the app delegate
-      # @param {Object} arg the argument to pass to the selector
+      # @param {String} selector the selector to perform on the app delegate
+      # @param {Object} argument the argument to pass to the selector
       # @return {Object} the result of performing the selector with the argument (serialized)
-      def backdoor(sel, arg)
+      def backdoor(selector, argument)
+
+        unless selector.end_with?(':')
+          messages =
+                [
+                     "Selector '#{selector}' is missing a trailing ':'",
+                     'Valid backdoor selectors must take one argument.',
+                     "Before 0.15.0, the server will append a trailing ':'.",
+                     ' After 0.15.0, this behavior is scheduled to change.',
+                     '',
+                     'http://developer.xamarin.com/guides/testcloud/calabash/working-with/backdoors/#backdoor_in_iOS',
+                     ''
+                ]
+          _deprecated('0.15.0', messages.join("\n"), :warn)
+        end
+
         json = {
-              :selector => sel,
-              :arg => arg
+              :selector => selector,
+              :arg => argument
         }
         res = http({:method => :post, :path => 'backdoor'}, json)
         res = JSON.parse(res)
         if res['outcome'] != 'SUCCESS'
-          screenshot_and_raise "backdoor #{json} failed because: #{res['reason']}\n#{res['details']}"
+          screenshot_and_raise "backdoor #{json} failed because:\n\n#{res['reason']}\n#{res['details']}"
         end
         res['result']
       end

data/lib/calabash-cucumber/ipad_1x_2x.rb

@@ -49,6 +49,9 @@ module Calabash
                       :emulated_2x => '1X'}
         }
 
+        # accessibility key = fullscreen.zoom => 2x => Switch to full screen mode
+        # accessibility key = normal.zoom => 1x => Switch to normal mode
+
         # @!visibility private
         # @!attribute [r] scale
         # The current 1X or 2X scale represented as a Symbol.
@@ -242,4 +245,4 @@ module Calabash
 
     end
   end
-end
+end

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -898,6 +898,24 @@ module Calabash
         end
       end
 
+      # Waits for a keyboard to appear and returns the localized name of the
+      # `key_code` signifier
+      #
+      # @param [String] key_code Maps to a specific name in some localization
+      def lookup_key_name(key_code)
+        wait_for_keyboard
+        begin
+          response_json = JSON.parse(http(:path => 'keyboard-language'))
+        rescue JSON::ParserError
+          raise RuntimeError, "Could not parse output of keyboard-language route. Did the app crash?"
+        end
+        if response_json['outcome'] != 'SUCCESS'
+          screenshot_and_raise "failed to retrieve the keyboard localization"
+        end
+        localized_lang = response_json['results']['input_mode']
+        RunLoop::L10N.new.lookup_localization_name(key_code, localized_lang)
+      end
+
       # @!visibility private
       # Returns the the text in the first responder.
       #

data/lib/calabash-cucumber/launcher.rb

@@ -55,6 +55,7 @@ class Calabash::Cucumber::Launcher
   attr_accessor :actions
   attr_accessor :launch_args
   attr_accessor :simulator_launcher
+  attr_reader :xcode
 
   # @!visibility private
   # Generated when calabash cannot launch the app.
@@ -76,6 +77,10 @@ class Calabash::Cucumber::Launcher
   class CalabashLauncherTimeoutErr < Timeout::Error
   end
 
+  def xcode
+    @xcode ||= RunLoop::Xcode.new
+  end
+
   # @!visibility private
   def initialize
     @simulator_launcher = Calabash::Cucumber::SimulatorLauncher.new
@@ -274,7 +279,7 @@ class Calabash::Cucumber::Launcher
 
     sim_control = opts.fetch(:sim_control, RunLoop::SimControl.new)
     if sim_control.xcode_version_gte_6?
-      default_sim = RunLoop::Core.default_simulator(sim_control.xctools)
+      default_sim = RunLoop::Core.default_simulator(xcode)
       name_or_udid = merged_opts[:udid] || ENV['DEVICE_TARGET'] || default_sim
 
       target_simulator = nil
@@ -487,7 +492,7 @@ class Calabash::Cucumber::Launcher
     return :instruments if major && major >= 7 # Only instruments supported for iOS7+
     return :sim_launcher if major # and then we have <= 6
 
-    if RunLoop::XCTools.new.xcode_version_gte_51?
+    if RunLoop::Xcode.new.version_gte_51?
       return use_sim_launcher_env? ? :sim_launcher : :instruments
     end
 
@@ -535,11 +540,11 @@ class Calabash::Cucumber::Launcher
 
     # RunLoop::Core.run_with_options can reuse the SimControl instance.  Many
     # of the Xcode tool calls, like instruments -s templates, take a long time
-    # to execute.  The SimControl instance has XCTool attribute which caches
-    # the results of many of these time-consuming calls so they only need to
-    # be called 1 time per launch.
+    # to execute.
     # @todo Use SimControl in Launcher in place of methods like simulator_target?
     args[:sim_control] = RunLoop::SimControl.new
+    args[:instruments] = RunLoop::Instruments.new
+    args[:xcode] = xcode
 
     if args[:app]
       if !File.exist?(args[:app])
@@ -624,7 +629,7 @@ class Calabash::Cucumber::Launcher
     if run_with_instruments?(args)
       # Patch for bug in Xcode 6 GM + iOS 8 device testing.
       # http://openradar.appspot.com/radar?id=5891145586442240
-      uia_strategy = default_uia_strategy(args, args[:sim_control])
+      uia_strategy = default_uia_strategy(args, args[:sim_control], args[:instruments])
       args[:uia_strategy] ||= uia_strategy
       calabash_info "Using uia strategy: '#{args[:uia_strategy]}'" if debug_logging?
 
@@ -656,14 +661,18 @@ class Calabash::Cucumber::Launcher
   #
   # rdar://18296714
   # http://openradar.appspot.com/radar?id=5891145586442240
-  def default_uia_strategy(launch_args, sim_control)
+  #
+  # @param [Hash] launch_args The launch arguments.
+  # @param [RunLoop::SimControl] sim_control Used to find simulators.
+  # @param [RunLoop::Instruments] instruments Used to find physical devices.
+  def default_uia_strategy(launch_args, sim_control, instruments)
     # Preferences strategy works on Xcode iOS Simulators.
     if RunLoop::Core.simulator_target?(launch_args, sim_control)
       :preferences
     else
       target_udid = launch_args[:device_target]
       target_device = nil
-      devices_connected = sim_control.xctools.instruments(:devices)
+      devices_connected = instruments.physical_devices
       devices_connected.each do |device|
         if device.udid == target_udid
           target_device = device
@@ -787,6 +796,11 @@ class Calabash::Cucumber::Launcher
               begin
                 connected = (ping_app == '200')
                 break if connected
+              rescue StandardError => e
+                if full_console_logging?
+                  puts "Could not connect. #{e.message}"
+                  puts "Will retry ..."
+                end
               ensure
                 sleep 1 unless connected
               end

data/lib/calabash-cucumber/map.rb

@@ -6,32 +6,60 @@ module Calabash
     # @!visibility private
     module Map
 
-      # returns an array of views matched by the `query` or the result of
+      # Returns an array of views matched by the `query` or the result of
       # performing the Objective-C sequence defined by the `method_name` and
-      # `method_args` on all the views matched by the `query`
+      # `method_args` on all the views matched by the `query`.
       #
-      # the query language is documented here: https://github.com/calabash/calabash-ios/wiki
+      # This is not a method that users should be calling directly.
       #
-      # returns a JSON representation of each view that is matched
+      # The `method_name` is typically mapped to an LPOperation on the server.
+      # Some examples of LPOperations are:
       #
-      # when the `method_name` is a calabash operation, returns an array that
-      # contains the result of calling the objc selector `description` on each
-      # matched view.  these are examples of calabash operations: `:flash`,
-      # `:scrollToRowWithMark`, `:changeDatePickerDate`.
+      #   * :flash
+      #   * :scrollToRowWithMark
+      #   * :changeDatePickerDate
+      #
+      # If `method_name` maps to no LPOperation, then it is treated a selector
+      # and is performed on any view that matches `query`.
+      #
+      # @examples
+      #
+      #   # Calls 'text' on any visible UITextField, because :text is not a defined operation.
+      #   > map("textField", :text)
+      #   => [ "old text" ]
+      #
+      #   # Does not call 'setText:', because :setText is a defined operation.
+      #   > map("textField", :setText, 'new text')
+      #   => [ <UITextField ... > ]
+      #
+      #   # Calls 'setText:', because 'setText:' is not a defined operation.
+      #   > map("textField", 'setText:', 'newer text')
+      #   => [ "<VOID>" ]
+      #
+      #   # Will return [] because :unknownSelector is not defined on UITextField.
+      #   > map("textField", :unknownSelector)
+      #   => []
+      #
+      #   # Will return [] because 'setAlpha' requires 1 argument and none was provided.
+      #   # An error will be logged by the server in the device logs.
+      #   > map("textField", 'setAlpha:')
+      #   => []
+      #
+      #
+      # Well behaved LPOperations should return the view as JSON objects.
+      #
+      # @todo Calabash LPOperations should return 'views touched' in JSON format
       def map(query, method_name, *method_args)
-        #todo calabash operations should return 'views touched' in JSON format
         raw_map(query, method_name, *method_args)['results']
       end
 
-      # returns a JSON object the represents the result of performing an http
+      # Returns a JSON object the represents the result of performing an http
       # query against the calabash server.
       #
-      # gem users should _not_ call this method directly; call `map` instead.
-      #
-      # raises an error and takes a screenshot if the value of the `outcome` key
+      # Raises an error and takes a screenshot if the value of the `outcome` key
       # is _not_ 'SUCCESS'
       #
-      # the JSON object contains the following keys:
+      # The JSON object contains the following keys:
       #
       #     `outcome` => indicates the success or failure of the query
       #
@@ -42,27 +70,7 @@ module Calabash
       #                  the `method_name` with arguments defined in
       #                  `method_args` on all views matched by the `query`
       #
-      # the query language is documented here: https://github.com/calabash/calabash-ios/wiki
-      #
-      # here are some examples that clarify how the `method_name` and `method_args`
-      # influence the value of the `results` key
-      #
-      # simple examples:
-      #
-      #    raw_map('label')['result'] #=> [ all visible UILabels ]
-      #       raw_map('label', :text) #=> [ the 'text' of all visible UILabels ]
-      #
-      # example of calling a selector with arguments:
-      #
-      # <tt>raw_map("tableView marked:'cheeses'", {'numberOfRowsInSection' => 0})) =></tt>
-      # <tt>[ the number of rows in the first section of the 'cheeses' table ]</tt>
-      #
-      # example of calling a selector on view to return an object and then calling
-      # another selector on the returned object:
-      #
-      # <tt>raw_map("pickerView marked:'cheeses'", :delegate, [{pickerView:nil},{titleForRow:1},{forComponent:0}]) =></tt>
-      # objc call: <tt>[[pickerView delegate] pickerView:nil titleForRow:1 forComponent:0] =></tt>
-      # <tt>['French']</tt>
+      # @see Calabash::Cucumber::Map#map for examples.
       def raw_map(query, method_name, *method_args)
         operation_map = {
             :method_name => method_name,

data/lib/calabash-cucumber/rotation_helpers.rb

@@ -87,7 +87,6 @@ module Calabash
             puts "try to rotate to '#{dir_sym}' using '#{candidate}'"
           end
           playback(candidate)
-          # need a longer sleep for cloud testing
           sleep(0.4)
           recalibrate_after_rotation()
 
@@ -117,17 +116,10 @@ module Calabash
       # @example rotate right
       #  rotate :right
       #
-      # @example rotate down
-      #  rotate :down
+      # @param [Symbol] dir The direction to rotate.  Can be :left or :right.
       #
-      # @example rotate up
-      #  rotate :up
-      #
-      # @note For legacy support the `dir` argument can be a String or Symbol.
-      #  Please update your code to pass a Symbol.
-      #
-      # @param [Symbol] dir The position of the home button after the rotation.
-      #  Can be one of `{:down | :left | :right | :up }`.
+      # @return [Symbol] The position of the home button relative to the status
+      #   bar after the rotation.  Can be one of `{:down | :left | :right | :up }`.
       def rotate(dir)
         dir = dir.to_sym
         current_orientation = status_bar_orientation().to_sym
@@ -173,4 +165,4 @@ module Calabash
 
     end
   end
-end
+end

data/lib/calabash-cucumber/utils/logging.rb

@@ -92,7 +92,7 @@ module Calabash
             stack = Kernel.caller(0, 6)[1..-1].join("\n")
           end
 
-          msg = "deprecated '#{version}' - '#{msg}'\n#{stack}"
+          msg = "deprecated '#{version}' - #{msg}\n#{stack}"
 
           if type.eql?(:pending)
             pending(msg)

data/lib/calabash-cucumber/version.rb

@@ -3,10 +3,10 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.14.3'
+    VERSION = '0.15.0'
 
     # @!visibility public
     # The minimum required version of the Calabash embedded server.
-    MIN_SERVER_VERSION = '0.14.3'
+    MIN_SERVER_VERSION = '0.15.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.0
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: edn
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -236,14 +236,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -551,7 +551,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS