calabash-cucumber 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8d1ae811a8e9ce1b128587fde8169a360a814f4
-  data.tar.gz: 5362957ea9cbf06f092a4d6274c438e9e6d2f920
+  metadata.gz: 025464e725f8c4d6ff249aaf250a6685896a75f6
+  data.tar.gz: 37858349091f137c9888024cd77cbb856c60c41d
 SHA512:
-  metadata.gz: a96c9b3f4680184761ca7c35e2b80e557bb539dbd30f408031e93ba1d1fa5e0897658296a3f49c0da2e4dc649c3a5fd57b5adf5afed622b8a445ccc6eaabc75b
-  data.tar.gz: 08fd8ceedc0c2961abd1d8ccf24809eba00fbe1c0be7f1bae925b08052e64e31e80480554b9c7ff560f88ec4e8d0fe0ff9ed9feef2271590522ad46c8415aa87
+  metadata.gz: c635ff3050323a9233fedc5a000eb7ba3ece0d93fa7708d6365c89a38b55757794bf9fa311e276e5406cac166b87cf7930adeab1d9a5c1d02618356415972cda
+  data.tar.gz: 62dd3aa71a22c78c10ec5377a53277af29701cfa291941ce03db779505f6f9eaeb316b7d1d8aac16d20b95cddc8a10b6a7ece2b865c1309091f5176ddb4ee903

data/lib/calabash-cucumber/console_helpers.rb

@@ -279,7 +279,9 @@ Please report this issue.
           str_id = data["id"] ? "[id:#{RunLoop::Color.blue(data["id"])}] " : ""
           str_label = data["label"] ? "[label:#{RunLoop::Color.green(data["label"])}] " : ""
           str_text = data["value"] ? "[text:#{RunLoop::Color.magenta(data["value"])}] " : ""
-          output("#{str_type}#{str_id}#{str_label}#{str_text}", indentation)
+          str_node_type = data["nodeType"] ? "[nodeType:#{RunLoop::Color.red(data["nodeType"])}] " : ""
+
+          output("#{str_type}#{str_id}#{str_label}#{str_text}#{str_node_type}", indentation)
           output("\n", indentation)
         end
       end

data/lib/calabash-cucumber/device.rb

@@ -102,7 +102,8 @@ module Calabash
       #    :sample => 1,
       #    :height => 1334,
       #    :width => 750,
-      #    :scale" => 2
+      #    :scale" => 2,
+      #    :native_scale => 2
       #  }
       #
       #

data/lib/calabash-cucumber/failure_helpers.rb

@@ -51,7 +51,12 @@ module Calabash
       def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
         path = screenshot(options)
         filename = options[:label] || File.basename(path)
-        embed(path, 'image/png', filename)
+        if self.respond_to?(:embed)
+          embed(path, 'image/png', filename)
+        else
+          RunLoop.log_info2("Embed is not available in this context. Will not embed.")
+        end
+        true
       end
 
       # Generates a screenshot of the app UI by calling screenshot_embed and raises an error.
@@ -82,7 +87,6 @@ module Calabash
       def fail(msg='Error. Check log for details.', options={:prefix => nil, :name => nil, :label => nil})
         screenshot_and_raise(msg, options)
       end
-
     end
   end
-end
+end

data/lib/calabash-cucumber/http/http.rb

@@ -66,7 +66,7 @@ module Calabash
 
           begin
             success, body = self.ping_app
-            RunLoop.log_debug("Connected to Calaash Server on try: #{try + 1} of #{max_retry_count}")
+            RunLoop.log_debug("Connected to Calabash Server on try: #{try + 1} of #{max_retry_count}")
             return success, body if success
           rescue => e
             last_error = e

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -229,17 +229,8 @@ module Calabash
         return if opts[:skip]
 
         screenshot = opts[:screenshot]
-        unless keyboard_visible?
-          msg = 'no visible keyboard'
-          if screenshot
-            screenshot_and_raise msg
-          else
-            raise msg
-          end
-        end
-
-        if split_keyboard_visible? and uia_not_available?
-          msg = 'cannot type on a split keyboard without launching with Instruments'
+        if !keyboard_visible?
+          msg = "No visible keyboard."
           if screenshot
             screenshot_and_raise msg
           else
@@ -291,46 +282,32 @@ module Calabash
         _ensure_can_enter_text({:screenshot => should_screenshot,
                                 :skip => (not should_screenshot)})
 
-        if uia_available?
-          if chr.length == 1
-            uia_type_string_raw chr
-          else
-            code = UIA_SUPPORTED_CHARS[chr]
-
-            unless code
-              raise "typing character '#{chr}' is not yet supported when running with Instruments"
-            end
+        if chr.length == 1
+          uia_type_string_raw chr
+        else
+          code = UIA_SUPPORTED_CHARS[chr]
 
-            # on iOS 6, the Delete char code is _not_ \b
-            # on iOS 7, the Delete char code is \b on non-numeric keyboards
-            #           on numeric keyboards, it is actually a button on the
-            #           keyboard and not a key
-            if code.eql?(UIA_SUPPORTED_CHARS['Delete'])
-              js_tap_delete = "(function() {"\
-                  "var deleteElement = uia.keyboard().elements().firstWithName('Delete');"\
-                  "deleteElement = deleteElement.isValid() ? deleteElement : uia.keyboard().elements().firstWithName('delete');"\
-                  "deleteElement.tap();"\
-                "})();"
-              uia(js_tap_delete)
-            else
-              uia_type_string_raw(code)
-            end
+          unless code
+            raise "typing character '#{chr}' is not yet supported when running with Instruments"
           end
-          # noinspection RubyStringKeysInHashInspection
-          res = {'results' => []}
-        else
-          res = http({:method => :post, :path => 'keyboard'},
-                     {:key => chr, :events => load_playback_data('touch_done')})
-          res = JSON.parse(res)
-          if res['outcome'] != 'SUCCESS'
-            msg = "Keyboard enter failed failed because: #{res['reason']}\n#{res['details']}"
-            if should_screenshot
-              screenshot_and_raise msg
-            else
-              raise msg
-            end
+
+          # on iOS 6, the Delete char code is _not_ \b
+          # on iOS 7, the Delete char code is \b on non-numeric keyboards
+          #           on numeric keyboards, it is actually a button on the
+          #           keyboard and not a key
+          if code.eql?(UIA_SUPPORTED_CHARS['Delete'])
+            js_tap_delete = "(function() {"\
+              "var deleteElement = uia.keyboard().elements().firstWithName('Delete');"\
+              "deleteElement = deleteElement.isValid() ? deleteElement : uia.keyboard().elements().firstWithName('delete');"\
+              "deleteElement.tap();"\
+              "})();"
+            uia(js_tap_delete)
+          else
+            uia_type_string_raw(code)
           end
         end
+        # noinspection RubyStringKeysInHashInspection
+        res = {'results' => []}
 
         if ENV['POST_ENTER_KEYBOARD']
           w = ENV['POST_ENTER_KEYBOARD'].to_f
@@ -349,19 +326,9 @@ module Calabash
       # @raise [RuntimeError] if the text cannot be typed.
       def keyboard_enter_text(text)
         _ensure_can_enter_text
-        if uia_available?
-          text_before = _text_from_first_responder()
-          text_before = text_before.gsub("\n","\\n") if text_before
-          uia_type_string(text, text_before)
-        else
-          text.each_char do |ch|
-            begin
-              keyboard_enter_char(ch, {:should_screenshot => false})
-            rescue
-              _search_keyplanes_and_enter_char(ch)
-            end
-          end
-        end
+        text_before = _text_from_first_responder()
+        text_before = text_before.gsub("\n","\\n") if text_before
+        uia_type_string(text, text_before)
       end
 
       # @!visibility private
@@ -406,14 +373,9 @@ module Calabash
       # @param [String] text the text to enter
       def fast_enter_text(text)
         _ensure_can_enter_text
-        if uia_available?
-          uia_set_responder_value(text)
-        else
-          keyboard_enter_text(text)
-        end
+        uia_set_responder_value(text)
       end
 
-
       # Touches the keyboard action key.
       #
       # The action key depends on the keyboard.  Some examples include:
@@ -528,13 +490,8 @@ module Calabash
       #
       # @raise [RuntimeError] if the device is not an iPad
       def dismiss_ipad_keyboard
-        screenshot_and_raise 'cannot dismiss keyboard on iphone' if device_family_iphone?
-
-        if uia_available?
-          send_uia_command({:command =>  "#{_query_uia_hide_keyboard_button}.tap()"})
-        else
-          touch(_query_for_keyboard_mode_key)
-        end
+        screenshot_and_raise "Cannot dismiss keyboard on iPhone" if device_family_iphone?
+        send_uia_command({:command =>  "#{_query_uia_hide_keyboard_button}.tap()"})
 
         opts = {:timeout_message => 'keyboard did not disappear'}
         wait_for(opts) do
@@ -553,78 +510,12 @@ module Calabash
       # @raise [RuntimeError] when the device is not an iPad
       # @raise [RuntimeError] the app was not launched with instruments
       def _point_for_ipad_keyboard_mode_key
-        raise 'the keyboard mode does not exist on the on the iphone' if device_family_iphone?
-        raise 'cannot detect keyboard mode key without launching with instruments' unless uia_available?
+        raise "The keyboard mode does not exist on the on the iphone" if device_family_iphone?
         res = send_uia_command({:command => "#{_query_uia_hide_keyboard_button}.rect()"})
         origin = res['value']['origin']
         {:x => origin['x'], :y => origin['y']}
       end
 
-      # @!visibility private
-      # Returns a query string for touching one of the options that appears when
-      # the iPad mode key is touched and held.
-      #
-      # The mode key is also know as the 'Hide keyboard' key.
-      #
-      # @note
-      #  This is only available when running outside of instruments.
-      #
-      # @param [Symbol] top_or_bottom can be one of `{:top | :bottom}`
-      # @param [Symbol] mode `{:docked | :undocked | :skipped}`
-      #
-      # @raise [RuntimeError] the device is not an iPad
-      # @raise [RuntimeError] the app was not launched with instruments
-      # @raise [RuntimeError] the method is passed invalid arguments
-      def _query_for_touch_for_keyboard_mode_option(top_or_bottom, mode)
-        raise 'the keyboard mode does not exist on the iphone' if device_family_iphone?
-
-        if uia_available?
-          raise "UIA is available, use '_point_for_keyboard_mode_key' instead"
-        end
-
-        valid = [:top, :bottom]
-        unless valid.include? top_or_bottom
-          raise "expected '#{top_or_bottom}' to be one of '#{valid}'"
-        end
-
-        valid = [:split, :undocked, :docked]
-        unless valid.include? mode
-          raise "expected '#{mode}' to be one of '#{valid}'"
-        end
-
-        hash = {:split => {:top => 'Merge',
-                           :bottom => 'Dock and Merge'},
-                :undocked => {:top => 'Dock',
-                              :bottom => 'Split'},
-                :docked => {:top => 'Undock',
-                            :bottom => 'Split'}}
-        mark = hash[mode][top_or_bottom]
-        "label marked:'#{mark}'"
-      end
-
-      # @!visibility private
-      # Returns a query for touching the iPad keyboard mode key.
-      #
-      # The mode key is also know as the 'Hide keyboard' key.
-      #
-      # @note
-      #  This is only available when running outside of instruments.  Use
-      #  ` _point_for_ipad_keyboard_mode_key` when the app is _not_ launched
-      #  with instruments.
-      #
-      # raises an error when
-      # * the device is not an iPad
-      # * the app was launched with Instruments i.e. there is a <tt>run_loop</tt>
-      def _query_for_keyboard_mode_key
-        raise 'cannot detect keyboard mode key on iphone' if device_family_iphone?
-        if uia_available?
-          raise "UIA is available, use '_point_for_keyboard_mode_key' instead"
-        end
-        qstr = "view:'UIKBKeyView'"
-        idx = query(qstr).count - 1
-        "#{qstr} index:#{idx}"
-      end
-
       # @!visibility private
       # Touches the bottom option on the popup dialog that is presented when the
       # the iPad keyboard `mode` key is touched and held.
@@ -633,19 +524,12 @@ module Calabash
       #
       # The `mode` key allows the user to undock, dock, or split the keyboard.
       def _touch_bottom_keyboard_mode_row
-        mode = ipad_keyboard_mode
-        if uia_available?
-          start_pt = _point_for_ipad_keyboard_mode_key
-          # there are 10 pt btw the key and the popup and the row is 50 pt
-          y_offset = 10 + 25
-          end_pt = {:x => (start_pt[:x] - 40), :y => (start_pt[:y] - y_offset)}
-          uia_pan_offset(start_pt, end_pt, {})
-        else
-          pan(_query_for_keyboard_mode_key, nil, {:duration => 1.0})
-          touch(_query_for_touch_for_keyboard_mode_option(:bottom, mode))
-          sleep(0.5)
-        end
-        2.times { sleep(0.5) }
+        start_pt = _point_for_ipad_keyboard_mode_key
+        # there are 10 pt btw the key and the popup and the row is 50 pt
+        y_offset = 10 + 25
+        end_pt = {:x => (start_pt[:x] - 40), :y => (start_pt[:y] - y_offset)}
+        uia_pan_offset(start_pt, end_pt, {})
+        sleep(1.0)
       end
 
       # Touches the top option on the popup dialog that is presented when the
@@ -655,23 +539,15 @@ module Calabash
       #
       # The `mode` key allows the user to undock, dock, or split the keyboard.
       def _touch_top_keyboard_mode_row
-        mode = ipad_keyboard_mode
-        if uia_available?
-          start_pt = _point_for_ipad_keyboard_mode_key
-          # 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] - 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, {})
-          touch(_query_for_touch_for_keyboard_mode_option(:top, mode))
-          sleep(0.5)
-        end
-        2.times { sleep(0.5) }
+        start_pt = _point_for_ipad_keyboard_mode_key
+        # 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] - x_offset), :y => (start_pt[:y] - y_offset)}
+        uia_pan_offset(start_pt, end_pt, {:duration => 1.0})
       end
 
       # Ensures that the iPad keyboard is docked.
@@ -847,9 +723,6 @@ module Calabash
       #
       # @raise [RuntimeError] if the app was not launched with instruments
       def uia_keyboard_visible?
-        unless uia_available?
-          screenshot_and_raise 'only available if there is a run_loop i.e. the app was launched with Instruments'
-        end
         res = uia_query_windows(:keyboard)
         not res.eql?(':nil')
       end
@@ -865,9 +738,6 @@ module Calabash
       #
       # @raise [RuntimeError] if the app was not launched with instruments
       def uia_wait_for_keyboard(opts={})
-        unless uia_available?
-          screenshot_and_raise 'only available if there is a run_loop i.e. the app was launched with Instruments'
-        end
         default_opts = {:timeout => 10,
                         :retry_frequency => 0.1,
                         :post_timeout => 0.5}

data/lib/calabash-cucumber/launcher.rb

@@ -82,7 +82,7 @@ module Calabash
         else
           msg << "Not attached to instruments."
           msg << "Start your app with `start_test_server_in_background`"
-          msg << "If you app is already running, try `console_attach`"
+          msg << "If your app is already running, try `console_attach`"
         end
         msg.join("\n")
       end

data/lib/calabash-cucumber/map.rb

@@ -82,20 +82,23 @@ module Calabash
             :arguments => method_args
         }
 
-        res = Map.new.http({:method => :post, :path => 'map'},
-                                {:query => query, :operation => operation_map})
-        res = JSON.parse(res)
-        if res['outcome'] != 'SUCCESS'
+        route = {:method => :post, :path => "map"}
+        parameters = {:query => query,
+                      :operation => operation_map}
+        body = self.map_factory.http(route, parameters)
+
+        hash = JSON.parse(body)
+        if hash["outcome"] != "SUCCESS"
           message = %Q[
 map #{query}, #{method_name} failed for:
 
- reason: #{res["reason"]}
-details: #{res["details"]}
+ reason: #{hash["reason"]}
+details: #{hash["details"]}
 ]
-          Map.new.screenshot_and_raise(message)
+          self.map_factory.screenshot_and_raise(message)
         end
 
-        res
+        hash
       end
 
       # Asserts the result of a calabash `map` call and raises an error with
@@ -139,6 +142,12 @@ details: #{res["details"]}
           Map.new.screenshot_and_raise msg
         end
       end
+
+      private
+
+      def self.map_factory
+        Map.new
+      end
     end
   end
 end

data/lib/calabash-cucumber/uia.rb

@@ -12,11 +12,20 @@ module Calabash
       # @param {String} command the JavaScript snippet to execute
       # @return {Object} the result returned by the UIA process
       def uia(command, options={})
+        raise ArgumentError, "Please supply :command" unless command
+
         # UIA only makes sense if there is a run loop
         launcher = Calabash::Cucumber::Launcher.launcher_if_used
         run_loop = launcher && launcher.active? && launcher.run_loop
-        raise ArgumentError, 'the current launcher must be active and be attached to a run_loop' unless run_loop
-        raise ArgumentError, 'please supply :command' unless command
+
+        # Automatically attach in the calabash console
+        if !run_loop && defined?(IRB)
+          RunLoop.log_debug("Attaching to current instruments process...")
+          launcher = Calabash::Cucumber::Launcher.new
+          Calabash::Cucumber::Launcher.attach
+          run_loop = launcher.run_loop
+          RunLoop.log_debug("Attached!")
+        end
 
         strategy = run_loop[:uia_strategy]
         case strategy

data/lib/calabash-cucumber/version.rb

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

data/scripts/.irbrc

@@ -34,8 +34,9 @@ IRB.conf[:HISTORY_FILE] = ".irb-history"
 
 begin
   require "pry"
-  Pry.config.history.should_save = false
-  Pry.config.history.should_load = false
+  Pry.config.history.should_save = true
+  Pry.config.history.should_load = true
+  Pry.config.history.file = ".pry-history"
   require "pry-nav"
 rescue LoadError => _
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -142,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -314,6 +314,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
@@ -449,7 +463,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS