calabash 1.9.9.pre3 → 2.0.0.prelegacy

data/lib/calabash/utility.rb

@@ -5,7 +5,7 @@ module Calabash
 
   end
 
-  # @!visibility private
+  # Utility methods for testing.
   module Utility
 
     # @!visibility private
@@ -27,8 +27,8 @@ module Calabash
     #
     # @example
     #  # These are equivalent.
-    #  pan(percent(20, 50), percent(20, 100))
-    #  pan({x: 20, y: 50}, {x: 20, y: 100})
+    #  pan("*", percent(20, 50), percent(20, 100))
+    #  pan("*", {x: 20, y: 50}, {x: 20, y: 100})
     #
     # @param [Number] x The value of the x percent.
     # @param [Number] y The value of the y percent.
@@ -40,12 +40,12 @@ module Calabash
     alias_method :pct, :percent
 
     # A convenience method for creating a coordinate hash that that can be
-    # passed to gestures.
+    # passed to the tap_coordinate gesture.
     #
     # @example
     #  # These are equivalent.
-    #  tap(query, offset: coordinate(20, 50))
-    #  tap(query, offset: {x: 20, y: 50})
+    #  tap_coordinate(coordinate(20, 50)
+    #  tap_coordinate({x: 20, y: 50})
     #
     # @param [Number] x The value of the x.
     # @param [Number] y The value of the y.

data/lib/calabash/version.rb

@@ -1,5 +1,5 @@
 module Calabash
 
   # @!visibility private
-  VERSION = '1.9.9.pre3'
+  VERSION = "2.0.0.prelegacy"
 end

data/lib/calabash/wait.rb

@@ -1,7 +1,6 @@
 module Calabash
 
   # A public API for waiting for things to happen.
-  # @!visibility private
   module Wait
     # @!visibility private
     class TimeoutError < RuntimeError
@@ -28,10 +27,14 @@ module Calabash
             screenshot_on_error: true
         }
 
+    # Returns the default wait options.
+    # @return [Hash] Key/value pairs describing the wait options.
     def self.default_options
       @@default_options
     end
 
+    # Sets the default wait options.
+    # @param [Hash] value The new default wait options.
     def self.default_options=(value)
       @@default_options = value
     end
@@ -141,9 +144,15 @@ module Calabash
 
     # Waits for `query` to match one or more views.
     #
-    # @param [String] query Query to match view
+    # @example
+    #  wait_for_view({marked: 'mark'})
+    #
+    # @example
+    #  text = wait_for_view("myview")['text']
+    #
+    # @param [String, Hash, Calabash::Query] query Query to match view
     # @see Calabash::Wait#with_timeout for options
-    # @return [Object] The first view matching `query`.
+    # @return [Hash] The first view matching `query`.
     def wait_for_view(query, options={})
       if query.nil?
         raise ArgumentError, 'Query cannot be nil'
@@ -169,7 +178,9 @@ module Calabash
 
     # Waits for all `queries` to simultaneously match at least one view.
     #
-    # @param [Array<String>, String] queries List of queries or a query.
+    # @param [String, Hash, Calabash::Query] queries List of queries or a
+    #  query.
+    #
     # @see Calabash::Wait#with_timeout for options
     # @return [void] The return value for this method is undefined.
     def wait_for_views(*queries, **options)
@@ -200,7 +211,7 @@ module Calabash
 
     # Waits for `query` not to match any views
     #
-    # @param [String] query Query to match view
+    # @param [String, Hash, Calabash::Query] query Query to match view
     # @see Calabash::Wait#with_timeout for options
     def wait_for_no_view(query, options={})
       if query.nil?
@@ -226,7 +237,9 @@ module Calabash
 
     # Waits for all `queries` to simultaneously match no views
     #
-    # @param [Array<String>, String] queries List of queries or a query.
+    # @param [String, Hash, Calabash::Query] queries List of queries or a
+    #  query.
+    #
     # @see Calabash::Wait#with_timeout for options
     def wait_for_no_views(*queries, **options)
       if queries.nil? || queries.any?(&:nil?)
@@ -252,7 +265,7 @@ module Calabash
 
     # Does the given `query` match at least one view?
     #
-    # @param [String] query Query to match view
+    # @param [String, Hash, Calabash::Query] query Query to match view
     # @return [Object] Returns truthy if the `query` matches at least one view
     # @raise [ArgumentError] If given an invalid `query`
     def view_exists?(query)
@@ -271,7 +284,9 @@ module Calabash
 
     # Does the given `queries` all match at least one view?
     #
-    # @param [Array<String>, String] queries List of queries or a query
+    # @param [String, Hash, Calabash::Query] queries List of queries or a
+    #  query
+    #
     # @return Returns truthy if the `queries` all match at least one view
     # @raise [ArgumentError] If given an invalid list of queries
     def views_exist?(*queries)
@@ -291,7 +306,7 @@ module Calabash
     # Expect `query` to match at least one view. Raise an exception if it does
     # not.
     #
-    # @param [String] query Query to match view
+    # @param [String, Hash, Calabash::Query] query Query to match a view
     # @raise [ArgumentError] If given an invalid `query`
     # @raise [ViewNotFoundError] If `query` does not match at least one view
     def expect_view(query)
@@ -303,6 +318,8 @@ module Calabash
         raise ViewNotFoundError,
               "No view matched #{parse_query_list(query)}"
       end
+
+      true
     end
 
     alias_method :view_should_exist, :expect_view
@@ -310,7 +327,8 @@ module Calabash
     # Expect `queries` to each match at least one view. Raise an exception if
     # they do not.
     #
-    # @param [String] queries List of queries or a query
+    # @param [String, Hash, Calabash::Query] queries List of queries or a
+    #  query.
     # @raise [ArgumentError] If given an invalid list of queries
     # @raise [ViewNotFoundError] If `queries` do not all match at least one
     #   view.
@@ -323,12 +341,15 @@ module Calabash
         raise ViewNotFoundError,
               "Not all queries #{parse_query_list(queries)} matched a view"
       end
+
+      true
     end
 
     alias_method :views_should_exist, :expect_views
 
     # Expect `query` to match no views. Raise an exception if it does.
     #
+    # @param [String, Hash, Calabash::Query] query Query to match a view
     # @raise [ArgumentError] If given an invalid `query`
     # @raise [ViewFoundError] If `query` matches any views.
     def do_not_expect_view(query)
@@ -339,13 +360,16 @@ module Calabash
       if view_exists?(query)
         raise ViewFoundError, "A view matched #{parse_query_list(query)}"
       end
+
+      true
     end
 
     alias_method :view_should_not_exist, :do_not_expect_view
 
     # Expect `queries` to each match no views. Raise an exception if they do.
     #
-    # @param [Array<String>, String] queries List of queries or a query
+    # @param [String, Hash, Calabash::Query] queries List of queries or a
+    #  query.
     # @raise [ArgumentError] If given an invalid list of queries
     # @raise [ViewFoundError] If one of `queries` matched any views
     def do_not_expect_views(*queries)
@@ -357,6 +381,8 @@ module Calabash
         raise ViewFoundError,
               "Some views matched #{parse_query_list(queries)}"
       end
+
+      true
     end
 
     alias_method :views_should_not_exist, :do_not_expect_views

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash
 version: !ruby/object:Gem::Version
-  version: 1.9.9.pre3
+  version: 2.0.0.prelegacy
 platform: ruby
 authors:
 - Jonas Maturana Larsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -93,20 +93,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -389,6 +389,7 @@ files:
 - lib/calabash/android/environment.rb
 - lib/calabash/android/gestures.rb
 - lib/calabash/android/interactions.rb
+- lib/calabash/android/legacy.rb
 - lib/calabash/android/lib/.irbrc
 - lib/calabash/android/lib/AndroidManifest.xml
 - lib/calabash/android/lib/TestServer.apk
@@ -411,6 +412,7 @@ files:
 - lib/calabash/android/orientation.rb
 - lib/calabash/android/physical_buttons.rb
 - lib/calabash/android/screenshot.rb
+- lib/calabash/android/scroll.rb
 - lib/calabash/android/server.rb
 - lib/calabash/android/text.rb
 - lib/calabash/application.rb
@@ -437,10 +439,12 @@ files:
 - lib/calabash/ios/application.rb
 - lib/calabash/ios/conditions.rb
 - lib/calabash/ios/console_helpers.rb
+- lib/calabash/ios/date_picker.rb
 - lib/calabash/ios/defaults.rb
 - lib/calabash/ios/device.rb
 - lib/calabash/ios/device/device_implementation.rb
 - lib/calabash/ios/device/gestures_mixin.rb
+- lib/calabash/ios/device/ipad_1x_2x_mixin.rb
 - lib/calabash/ios/device/keyboard_mixin.rb
 - lib/calabash/ios/device/physical_device_mixin.rb
 - lib/calabash/ios/device/rotation_mixin.rb
@@ -481,13 +485,16 @@ files:
 - lib/calabash/ios/runtime.rb
 - lib/calabash/ios/scroll.rb
 - lib/calabash/ios/server.rb
+- lib/calabash/ios/slider.rb
 - lib/calabash/ios/text.rb
 - lib/calabash/ios/uia.rb
+- lib/calabash/legacy.rb
 - lib/calabash/lib/skeleton/.gitignore
 - lib/calabash/lib/skeleton/Gemfile
 - lib/calabash/lib/skeleton/config/cucumber.yml
 - lib/calabash/lib/skeleton/features/sample.feature
 - lib/calabash/lib/skeleton/features/step_definitions/calabash_steps.rb
+- lib/calabash/lib/skeleton/features/support/dry_run.rb
 - lib/calabash/lib/skeleton/features/support/env.rb
 - lib/calabash/lib/skeleton/features/support/hooks.rb
 - lib/calabash/life_cycle.rb
@@ -525,7 +532,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Automated Acceptance Testing for Mobile Apps