calabash-cucumber 0.11.5.pre3 → 0.11.5.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c95f4d2f10d62d51c4e738deaf8609a0f6b5c5c
-  data.tar.gz: e7cb52842ae5531fff2d7f3e6762661ab5990a86
+  metadata.gz: 2d50dadedbe0fd3ab4421be5e585d026bd55c002
+  data.tar.gz: a8d3d2e54340109561018c73fb0fc0a7ede6669b
 SHA512:
-  metadata.gz: 41d1cac4aff7835fc754925de60d8ecbe0b23ec42148ef7f745bdb2c11cc153adee1f0e393d1be529a3094461767b369dc5586f64316f3d1c9bdcf62c8d85c11
-  data.tar.gz: d3c775f3d41f41ec239f1f37e80d79e3fe795c4cc379d3288949636be0be934fcf37138e65c53a816b90756e6f26a1d54218e1bff2626136cffbcdd22d77d233
+  metadata.gz: 77f902a52e4d614a19795d456cf08dafad343031f4e7d4adbf1276564c07194f82b526cf85f088a9bd9fe7afe172c6471459f5b47036c6db7e8426bb689e7b39
+  data.tar.gz: aca1228b4be8f4ec21b4809ca300fe6b1ea123f5dd5cbcb24f8cb9c8bc621381d7c9c6f8a7add5310f8ef556923c43d5046c8481abb0bc1e3425387fad833412

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -311,7 +311,7 @@ module Calabash
 
         if uia_available?
           if chr.length == 1
-            uia_type_string chr
+            uia_type_string_raw chr
           else
             code = UIA_SUPPORTED_CHARS[chr]
 
@@ -325,10 +325,8 @@ module Calabash
             #           keyboard and not a key
             if code.eql?(UIA_SUPPORTED_CHARS['Delete'])
               uia("uia.keyboard().elements().firstWithName('Delete').tap()")
-            elsif code.eql?(UIA_SUPPORTED_CHARS['Return'])
-              tap_keyboard_action_key
             else
-              uia_type_string(code, '')
+              uia_type_string_raw(code)
             end
           end
           # noinspection RubyStringKeysInHashInspection
@@ -379,6 +377,56 @@ module Calabash
         end
       end
 
+      # @!visibility private
+      #
+      # Enters text into view identified by a query
+      #
+      # @note
+      # *IMPORTANT* enter_text defaults to calling 'setValue' in UIAutomation
+      # on the text field. This is fast, but in some cases might result in slightly
+      # different behaviour than using `keyboard_enter_text`.
+      # To force use of `keyboard_enter_text` in `enter_text` use
+      # option :use_keyboard
+      #
+      # @param [String] uiquery the element to enter text into
+      # @param [String] text the text to enter
+      # @param [Hash] options controls details of text entry
+      # @option options [Boolean] :use_keyboard (false) use the iOS keyboard
+      #   to enter each character separately
+      # @option options [Boolean] :wait (true) call wait_for_element_exists with uiquery
+      # @option options [Hash] :wait_options ({}) if :wait pass this as options to wait_for_element_exists
+      def enter_text(uiquery, text, options = {})
+        default_opts = {:use_keyboard => false, :wait => true, :wait_options => {}}
+        options = default_opts.merge(options)
+        wait_for_element_exists(uiquery, options[:wait_options]) if options[:wait]
+        touch(uiquery, options)
+        wait_for_keyboard
+        if options[:use_keyboard]
+          keyboard_enter_text(text)
+        else
+          fast_enter_text(text)
+        end
+      end
+
+      # @!visibility private
+      #
+      # Enters text into current text input field
+      #
+      # @note
+      # *IMPORTANT* fast_enter_text defaults to calling 'setValue' in UIAutomation
+      # on the text field. This is fast, but in some cases might result in slightly
+      # different behaviour than using `keyboard_enter_text`.
+      # @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
+      end
+
+
       # Touches the keyboard action key.
       #
       # The action key depends on the keyboard.  Some examples include:
@@ -395,16 +443,7 @@ module Calabash
       #
       # @raise [RuntimeError] if the text cannot be typed.
       def tap_keyboard_action_key
-        if uia_available?
-          run_loop = Calabash::Cucumber::Launcher.launcher.run_loop
-          if run_loop[:uia_strategy] == :host
-            uia_type_string "\\\\n", '', false
-          else
-            uia_type_string '\n', '', false
-          end
-        else
-          keyboard_enter_char 'Return'
-        end
+        keyboard_enter_char 'Return'
       end
 
       # @deprecated 0.10.0 replaced with `tap_keyboard_action_key`

data/lib/calabash-cucumber/query_helpers.rb

@@ -15,7 +15,7 @@ module Calabash
       # @param {String} str string to escape
       # @return {String} escaped version of `str`
       def escape_string(str)
-        escape_quotes(escape_backslashes(str))
+        escape_newlines(escape_quotes(escape_backslashes(str)))
       end
 
       # call this method to properly escape blackslashes (\) in Calabash methods
@@ -37,6 +37,24 @@ module Calabash
         str.gsub(backslash, backslash*4)
       end
 
+      # call this method to properly escape newlines (\n) in Calabash methods
+      # (queries and uia actions).
+      # This helper frees you from manual escaping.
+      # Note entering a 'newline' character only works in iOS UITextViews
+      # @note
+      #  In ruby it is important to remember that "\n" is a *single character* string containing
+      #  a new-line.
+      #
+      # @example
+      #   quoted = escape_newlines("Karl's \n annoying problem")
+      #   # => "Karl's \\n annoying problem"
+      # @param {String} str string to escape
+      # @return {String} escaped version of `str`
+      def escape_newlines(str)
+        nl = "\n"
+        str.gsub(nl, "\\n")
+      end
+
       # call this method to properly escape single quotes in Calabash queries
       # Calabash iOS has some annoying rules for text containing single quotes.
       # This helper frees you from manual escaping.

data/lib/calabash-cucumber/uia.rb

@@ -144,13 +144,22 @@ module Calabash
       # @param {Array} args_arr array describing the query, e.g., `[:button, {marked:'foo'}]`
       # @param {Array} opts optional arguments specifying a chained sequence of method calls (see example)
       def uia_call(args_arr, *opts)
-        uia_call_method(:queryEl, args_arr, *opts)
+        uia_call_method(:queryEl, [args_arr], *opts)
       end
 
       # Similar to `uia_call` but searches all windows
       # @see #uia_call
       def uia_call_windows(args_arr, *opts)
-        uia_call_method(:queryElWindows, args_arr, *opts)
+        uia_call_method(:queryElWindows, [args_arr], *opts)
+      end
+
+      # Advanced method used for fast keyboard entry by calling the setValue method
+      # on the input with current keyboard focus.
+      # This is an alternative to calling `keyboard_enter_text`
+      #
+      # @param {String} value the value to set
+      def uia_set_responder_value(value)
+        uia_call_method(:elementWithKeyboardFocus, [], setValue: value)
       end
 
       # @!visibility private
@@ -228,6 +237,16 @@ module Calabash
         uia_handle_command(:swipeOffset, offset, options)
       end
 
+      # @!visibility private
+      def uia_drag_inside(dir, queryparts, options={})
+        uia_call_method(:swipe, [dir, queryparts, options])
+      end
+
+      # @!visibility private
+      def uia_drag_inside_mark(dir, mark, options={})
+        uia_call_method(:swipeMark, [dir, "\"#{mark}\"", options])
+      end
+
       # @!visibility private
       def uia_pinch(*queryparts)
         uia_handle_command(:pinch, queryparts)
@@ -288,6 +307,10 @@ module Calabash
         end
       end
 
+      def uia_type_string_raw(str)
+        uia("uia.keyboard().typeString('#{str}')")
+      end
+
       # @!visibility private
       def uia_enter
         uia_handle_command(:enter)
@@ -319,9 +342,9 @@ module Calabash
       # @!visibility private
       def uia_call_method(cmd, args_arr, *opts)
         if opts.empty?
-          return uia_handle_command(cmd, args_arr)
+          return uia_handle_command(cmd, *args_arr)
         end
-        js_cmd = uia_serialize_command(cmd, args_arr)
+        js_cmd = uia_serialize_command(cmd, *args_arr)
 
         js_args = []
         opts.each do |invocation|

data/lib/calabash-cucumber/version.rb

@@ -3,7 +3,7 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.11.5.pre3'
+    VERSION = '0.11.5.pre5'
 
     # @!visibility public
     # The minimum required version of the calabash.framework or, for Xamarin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.11.5.pre3
+  version: 0.11.5.pre5
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1.pre7
+        version: 1.1.1.pre9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1.pre7
+        version: 1.1.1.pre9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -224,16 +224,16 @@ dependencies:
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement