calabash-cucumber 0.20.3 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d80bc583ef0ea5ae3fb6548acd4d5ced7f15b2c
-  data.tar.gz: 61431194a8a83d91b41674c2d5ec6f83076b92fa
+  metadata.gz: f28de120ca199bf85fbeff075567483c62b682d8
+  data.tar.gz: b908f62ee4c05054cfbb92009e90820f0e6f71cb
 SHA512:
-  metadata.gz: 1b9e3bbb6993f444dfd6a9e83e8e4de9d9c2b48080a820c71032967755366eb984de455bac2bfce9fe18a823050a482c8cdf937c56e1e8ae6cfc592b8047fcc8
-  data.tar.gz: c25c2390ba6e3b3542bfa5e5a1c5cad9dfc6ad73fea899405f2aacc8b25d09b817a3f92dee5a1285cd8a67044ee7b189730bb67c20fc8c9c439c115c6bb1a0af
+  metadata.gz: fabc11fc1246e47f59a6e8e6c790d7746af27a4eb844af49d7162c2d5420ca449fd7c7d37df355c6d8b51916b0b4a280087028b8101a0152d421f0fc92714df3
+  data.tar.gz: a99481e54fbe0b03f9a113f17e792e64ed56c490d6d3a0d9d43f5b663468fa468ac94791fd382d4b996768085b782ca2ad6f6349b8562731e728d1f325d4e3ba

data/lib/calabash-cucumber/device_agent.rb

@@ -24,6 +24,28 @@ module Calabash
         @world = world
       end
 
+      # @!visibility private
+      def to_s
+        if client.running?
+          version = client.server_version["bundle_short_version"]
+        else
+          version = "not connected!"
+        end
+        "#<DeviceAgent API: #{version}>"
+      end
+
+      # @!visibility private
+      def inspect
+        to_s
+      end
+
+      # @!visibility private
+      # https://github.com/awesome-print/awesome_print/pull/253
+      # Awesome print patch for BasicObject
+      def ai(_)
+        to_s
+      end
+
       # Query the UI for elements.
       #
       # @example
@@ -115,6 +137,11 @@ module Calabash
         client.query(uiquery)
       end
 
+      # Perform a clear text on the active view
+      def clear_text
+        client.clear_text
+      end
+
       # Query for the center of a view.
       #
       # @see #query

data/lib/calabash-cucumber/http_helpers.rb

@@ -19,6 +19,8 @@ module Calabash
 
       # @!visibility private
       def http(options, data=nil)
+        _private_dismiss_springboard_alerts
+
         options[:uri] = url_for(options[:path])
         options[:method] = options[:method] || :get
         if data
@@ -30,6 +32,9 @@ module Calabash
         end
         res = make_http_request(options)
         res.force_encoding("UTF-8") if res.respond_to?(:force_encoding)
+
+        _private_dismiss_springboard_alerts
+
         res
       end
 
@@ -101,6 +106,18 @@ module Calabash
         http
       end
 
+      private
+
+      # @!visibility private
+      #
+      # Do not call this method.
+      def _private_dismiss_springboard_alerts
+        require "calabash-cucumber/launcher"
+        launcher = Calabash::Cucumber::Launcher.launcher_if_used
+        if launcher && launcher.automator && launcher.automator.name == :device_agent
+          launcher.automator.client.send(:_dismiss_springboard_alerts)
+        end
+      end
     end
   end
 end

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -188,12 +188,61 @@ module Calabash
         text
       end
 
+      # @!visibility private
+      # Returns the keyboard type as a symbol from the specified query
+      #
+      # UIKeyboardTypeDefault => :default
+      # UIKeyboardTypeASCIICapable => :ascii_capable
+      # UIKeyboardTypeNumbersAndPunctuation => :numbers_and_punctuation
+      # UIKeyboardTypeURL => :url
+      # UIKeyboardTypeNumberPad => :number_pad
+      # UIKeyboardTypePhonePad => :phone_pad
+      # UIKeyboardTypeNamePhonePad => :name_phone_pad
+      # UIKeyboardTypeEmailAddress => :email
+      # UIKeyboardTypeDecimalPad => :decimal
+      # UIKeyboardTypeTwitter => :twitter
+      # UIKeyboardTypeWebSearch => :web_search
+      #
+      # @raise [RuntimeError] if there is no visible keyboard
+      def keyboard_type(query = "* isFirstResponder:1")
+        if !keyboard_visible?
+          screenshot_and_raise "There must be a visible keyboard"
+        end
+
+        query_result = _query_wrapper(query, :keyboardType).first
+        keyboard_type = KEYBOARD_TYPES[query_result]
+
+        if !keyboard_type 
+          RunLoop.log_debug("Found query_result:#{query_result}, but expected
+                            to match key in #{KEYBOARD_TYPES}")
+          keyboard_type = :unknown
+        end
+
+        keyboard_type
+      end
+
       # @visibility private
       # TODO Remove in 0.21.0
       alias_method :_text_from_first_responder, :text_from_first_responder
 
       private
 
+      # @!visbility private
+      KEYBOARD_TYPES = {
+          0 => :default,
+          1 => :ascii_capable,
+          2 => :numbers_and_punctuation,
+          3 => :url,
+          4 => :number_pad,
+          5 => :phone_pad,
+          6 => :name_phone_pad,
+          7 => :email,
+          8 => :decimal,
+          9 => :twitter,
+          10 => :web_search
+        }
+
+
       # @!visibility private
       KEYBOARD_QUERY = "view:'UIKBKeyplaneView'"
 

data/lib/calabash-cucumber/map.rb

@@ -55,12 +55,6 @@ module Calabash
       #
       # @todo Calabash LPOperations should return 'views touched' in JSON format
       def self.map(query, method_name, *method_args)
-        require "calabash-cucumber/launcher"
-        launcher = Calabash::Cucumber::Launcher.launcher_if_used
-        if launcher && launcher.automator && launcher.automator.name == :device_agent
-          launcher.automator.client.send(:_dismiss_springboard_alerts)
-        end
-
         self.raw_map(query, method_name, *method_args)['results']
       end
 

data/lib/calabash-cucumber/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.20.4
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -142,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -483,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS