calabash-cucumber 0.14.2.pre1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d24ef92d4b66bd13c1ceb292b84588c6adbc3e
-  data.tar.gz: 9206b69d1c119c7d97d6a2820e656af3771e5731
+  metadata.gz: ccef20da034464aa0eb6747ea0f047731ad99528
+  data.tar.gz: 7aa938f5d8956a29aac66b410cf1b2b0aba34203
 SHA512:
-  metadata.gz: 310f714054788df414ae01f55a3aec7cf1af8501bd3da89cae3e9b8bf771262eb53c9537319e6a89c8f2d14d6acb0bb8afd6c716d7bdc2e460a2c53f066a2269
-  data.tar.gz: a820f3287a1aedbd678010cd53056e201691aef72d4484bafc50587f6c5817caf24427097dca06a4ea44a9b4f18b1e92eb5c38ba46e55f8ac7e417317196dfa4
+  metadata.gz: 16330bd75b391e907a4ba8eefcbf13f3f5f805c2f1959393747db63fb0f7b417d4f8ddbc82a5b0e3c65d5af6a4969068616b9cd2bc9f3881001ef77c207a89e2
+  data.tar.gz: 89da2e34073420b84db8dce75d8b7fcb6fe363d7e706d0d489399e52de0ca7619486e20d0476cb4c300a45b64983814a0647fbd47fdfa26263c89b1992a3875f

data/features/step_definitions/calabash_steps.rb

@@ -62,7 +62,7 @@ end
 
 Then /^I (?:press|touch) list item "([^\"]*)"$/ do |cell_name|
   if query("tableViewCell marked: '#{cell_name}'").empty?
-    touch("tableViewCell text:' #{cell_name}'")
+    touch("tableViewCell text: '#{cell_name}'")
   else
     touch("tableViewCell marked: '#{cell_name}'")
   end

data/lib/calabash-cucumber/core.rb

@@ -538,10 +538,10 @@ module Calabash
       #  a custom error message to display if the scrolling fails - if not
       #  specified, a generic failure will be displayed
       #
-      # @raise [RuntimeException] if the scroll cannot be performed
-      # @raise [RuntimeException] :query finds no collection view
-      # @raise [RuntimeException] the collection view does not contain a cell at item/section
-      # @raise [RuntimeException] :scroll_position is invalid
+      # @raise [RuntimeError] if the scroll cannot be performed
+      # @raise [RuntimeError] :query finds no collection view
+      # @raise [RuntimeError] the collection view does not contain a cell at item/section
+      # @raise [RuntimeError] :scroll_position is invalid
       def scroll_to_collection_view_item(item, section, opts={})
         default_options = {:query => 'collectionView',
                            :scroll_position => :top,
@@ -596,12 +596,12 @@ module Calabash
       #  a custom error message to display if the scrolling fails - if not
       #  specified, a generic failure will be displayed
       #
-      # @raise [RuntimeException] if the scroll cannot be performed
-      # @raise [RuntimeException] if the mark is nil
-      # @raise [RuntimeException] :query finds no collection view
-      # @raise [RuntimeException] the collection view does not contain a cell
+      # @raise [RuntimeError] if the scroll cannot be performed
+      # @raise [RuntimeError] if the mark is nil
+      # @raise [RuntimeError] :query finds no collection view
+      # @raise [RuntimeError] the collection view does not contain a cell
       #  with the mark
-      # @raise [RuntimeException] :scroll_position is invalid
+      # @raise [RuntimeError] :scroll_position is invalid
       def scroll_to_collection_view_item_with_mark(mark, opts={})
         default_options = {:query => 'collectionView',
                            :scroll_position => :top,

data/lib/calabash-cucumber/http_helpers.rb

@@ -48,7 +48,6 @@ module Calabash
       def make_http_request(options)
         retryable_errors = options[:retryable_errors] || RETRYABLE_ERRORS
         CAL_HTTP_RETRY_COUNT.times do |count|
-          previous_debug_dev = nil
           begin
             if not @http
               @http = init_request(options)
@@ -63,7 +62,7 @@ module Calabash
             raise Errno::ECONNREFUSED if response.status_code == 502
 
             return response.body
-          rescue Exception => e
+          rescue => e
 
             if retryable_errors.include?(e) || retryable_errors.any? { |c| e.is_a?(c) }
 
@@ -102,4 +101,4 @@ module Calabash
 
     end
   end
-end
+end

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -155,7 +155,7 @@ module Calabash
       #
       # @param [Hash] opts controls the `wait_for` behavior
       # @option opts [String] :timeout_message ('keyboard did not appear')
-      #  Controls the message that appears in the exception.
+      #  Controls the message that appears in the error.
       # @option opts [Number] :post_timeout (0.3) Controls how long to wait
       #  _after_ the keyboard has appeared.
       #

data/lib/calabash-cucumber/keychain_helpers.rb

@@ -29,8 +29,14 @@ module Calabash
       # @param [Hash] options
       # @raise [RuntimeError] if http request does not report success
       def _keychain_get(options={})
-        res = http({:method => :get, :raw => true, :path => 'keychain'}, options)
-        res = JSON.parse(res)
+        raw = http({:method => :get, :raw => true, :path => 'keychain'}, options)
+
+        begin
+          res = JSON.parse(raw)
+        rescue TypeError, JSON::ParserError => _
+          raise "Could not parse response '#{res}'; the app might have crashed or the server responded with invalid JSON."
+        end
+
         if res['outcome'] != 'SUCCESS'
           raise "get keychain with options '#{options}' failed because: '#{res['reason']}'\n'#{res['details']}'"
         end
@@ -105,11 +111,15 @@ module Calabash
       # @raise [RuntimeError] if http request does not report success
       def _keychain_post(options={})
         raw = http({:method => :post, :path => 'keychain'}, options)
-        res = JSON.parse(raw)
+        begin
+          res = JSON.parse(raw)
+        rescue TypeError, JSON::ParserError => _
+          raise "Could not parse response '#{res}'; the app might have crashed or the server responded with invalid JSON."
+        end
         if res['outcome'] != 'SUCCESS'
           raise "post keychain with options '#{options}' failed because: #{res['reason']}\n#{res['details']}"
         end
-        nil
+        res['results']
       end
 
       # On the iOS Simulator this clears *all* keychain entries for *all*

data/lib/calabash-cucumber/launch/simulator_launcher.rb

@@ -26,7 +26,7 @@ module Calabash
 
       # Custom error indicating a timeout in launching and connecting to the
       # embedded calabash server.
-      # @todo This is duplicated in Launcher class - consider exceptions.rb module.
+      # @todo This is duplicated in Launcher class - consider errors.rb module.
       class TimeoutErr < RuntimeError
       end
 
@@ -459,8 +459,6 @@ module Calabash
                   begin
                     connected = (ping_app == '200')
                     break if connected
-                  rescue Exception => e
-                    # nop
                   ensure
                     sleep 1 unless connected
                   end

data/lib/calabash-cucumber/launcher.rb

@@ -787,9 +787,6 @@ class Calabash::Cucumber::Launcher
               begin
                 connected = (ping_app == '200')
                 break if connected
-              rescue Exception => e
-                #p e
-                #retry
               ensure
                 sleep 1 unless connected
               end
@@ -819,11 +816,8 @@ class Calabash::Cucumber::Launcher
       sess.request Net::HTTP::Get.new(ENV['CALABASH_VERSION_PATH'] || "version")
     end
     status = res.code
-    begin
-      http.finish if http and http.started?
-    rescue Exception => e
 
-    end
+    http.finish if http and http.started?
 
     if status == '200'
       version_body = JSON.parse(res.body)

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

@@ -76,7 +76,7 @@ module Calabash
       # @param [String] version indicates when the feature was deprecated
       # @param [String] msg deprecation message (possibly suggesting alternatives)
       # @param [Symbol] type { :warn | :pending } - :pending will raise a
-      #   cucumber pending exception
+      #   cucumber pending error
       # @return [void]
       def _deprecated(version, msg, type)
         allowed = [:pending, :warn]
@@ -108,4 +108,4 @@ module Calabash
 
     end
   end
-end
+end

data/lib/calabash-cucumber/version.rb

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

data/lib/calabash-cucumber/wait_helpers.rb

@@ -112,7 +112,7 @@ module Calabash
           else
             raise wait_error(msg)
           end
-        rescue Exception => e
+        rescue => e
           handle_error_with_options(e, nil, screenshot_on_error)
         end
       end
@@ -212,16 +212,17 @@ module Calabash
       #   The same options as {Calabash::Cucumber::WaitHelpers::DEFAULT_OPTS} apply.
       # @return [nil] when the condition is satisfied
       # @raise [Calabash::Cucumber::WaitHelpers::WaitError] when the timeout is exceeded
-      def wait_for_element_does_not_exists(element_query, options={})
+      def wait_for_element_does_not_exist(element_query, options={})
         options[:timeout_message] = options[:timeout_message] || "Timeout waiting for element to not exist: #{element_query}"
         wait_for(options) { element_does_not_exist(element_query) }
       end
 
+      alias_method :wait_for_element_does_not_exists, :wait_for_element_does_not_exist
       # Waits for one or more Calabash queries to all return empty results (typically a UI elements to disappear).
       # Uses `wait_for`.
       # @see #wait_for
       # @see #wait_for_element_exists
-      # @see #wait_for_element_does_not_exists
+      # @see #wait_for_element_does_not_exist
       # @see Calabash::Cucumber::WaitHelpers::DEFAULT_OPTS
       #
       # @param [Array<String>] elements_arr an Array of Calabash queries to be empty (i.e. `element_does_not_exist(element_query)`)
@@ -288,8 +289,8 @@ module Calabash
           else
             raise wait_error(msg)
           end
-        rescue Exception => e
-          handle_error_with_options(e,nil, screenshot_on_error)
+        rescue => e
+          handle_error_with_options(e, nil, screenshot_on_error)
         end
       end
 
@@ -406,23 +407,26 @@ module Calabash
       end
 
       # @!visibility private
-      # raises an error by raising a exception and conditionally takes a
-      # screenshot based on the value of +screenshot_on_error+.
-      # @param [Exception,nil] ex an exception to raise
+      # Raises an error by raising a error and conditionally takes a screenshot
+      # based on the value of +screenshot_on_error+.
+      # @param [RuntimeError,nil] error an error to raise
       # @param [String,nil] timeout_message the message of the raise
       # @param [Boolean] screenshot_on_error if true takes a screenshot before
       #  raising an error
       # @return [nil]
-      # @raise RuntimeError based on +ex+ and +timeout_message+
-      def handle_error_with_options(ex, timeout_message, screenshot_on_error)
-        msg = (timeout_message || ex)
-        if ex
-          msg = "#{msg} (#{ex.class})"
+      # @raise [StandardError] If `error`, then that kind of error is raised.
+      #  Otherwise raise a RuntimeError.
+      def handle_error_with_options(error, timeout_message, screenshot_on_error)
+        msg = (timeout_message || error)
+        if error
+          error_class = error.class
+        else
+          error_class = RuntimeError
         end
         if screenshot_on_error
           screenshot_and_raise msg
         else
-          raise msg
+          raise error_class, msg
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.14.2.pre1
+  version: 0.14.2
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -546,12 +546,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS