calabash 2.0.0.pre11 → 2.0.0.prelegacy

data/lib/calabash/screenshot.rb

@@ -38,7 +38,7 @@ module Calabash
     # If the name given is an absolute path, then Calabash will save the
     # screenshot to the absolute directory given.
     #
-    # If the name given starts with ./ (e.g. `cal.screenshot('./foo.png')`) then
+    # If the name given starts with ./ (e.g. `screenshot('./foo.png')`) then
     # the filename will be saved relative to the current working directory.
     #
     # If the file specified by `name` has no extension then the filename will
@@ -49,11 +49,11 @@ module Calabash
     # @param [String] name Name of the screenshot.
     # @return [String] Path to the screenshot
     def screenshot(name=nil)
-      Calabash::Internal.with_default_device {|device| device.screenshot(name)}
+      Device.default.screenshot(name)
     end
 
     # Takes a screenshot and embeds it in the test report. This method is only
-    # available/useful when running in the context of Cucumber.
+    # available/useful when running in the context of cucumber.
     # @see Screenshot#screenshot
     def screenshot_embed(name=nil)
       path = screenshot(name)

data/lib/calabash/text.rb

@@ -4,19 +4,13 @@ module Calabash
   module Text
     # Enter `text` into the currently focused view.
     #
-    # @see Calabash::Text#enter_text_in
-    #
     # @param [String] text The text to type.
     # @raise [RuntimeError] if the text cannot be typed.
     def enter_text(text)
       _enter_text(text.to_s)
     end
 
-    # Enter `text` into the first view matched by `query`.
-    #
-    # @example
-    #  cal.enter_text_in({id: 'edit'}, "Hello World")
-    #
+    # Enter `text` into `query`.
     # @see Calabash::Text#enter_text
     #
     # @param [String] text The text to type.
@@ -27,18 +21,11 @@ module Calabash
     end
 
     # Clears the text of the currently focused view.
-    #
-    # @see Calabash::Text#clear_text_in
-    #
     def clear_text
       _clear_text
     end
 
-    # Clears the text in the first view matched by `query`
-    #
-    # @example
-    #  cal.clear_text_in({id: 'edit'})
-    #
+    # Clears the text `view`
     # @see Calabash::Text#clear_text
     #
     # @param [String, Hash, Calabash::Query] query A query describing the view
@@ -69,10 +56,10 @@ module Calabash
     # See http://developer.android.com/reference/android/view/inputmethod/EditorInfo.html
     #
     # @example
-    #  cal.tap_keyboard_action_key(:search)
-    #  cal.tap_keyboard_action_key(:send)
-    #  cal.tap_keyboard_action_key(:next)
-    #  cal.tap_keyboard_action_key(:previous)
+    #  tap_keyboard_action_key(:search)
+    #  tap_keyboard_action_key(:send)
+    #  tap_keyboard_action_key(:next)
+    #  tap_keyboard_action_key(:previous)
     #
     # Notice that, for Android, Calabash does not ensure that this particular action key is
     # actually available on the current keyboard.
@@ -92,13 +79,13 @@ module Calabash
     # Escapes single quotes in `string`.
     #
     # @example
-    #   cal.escape_single_quotes("Let's get this done.")
+    #   escape_single_quotes("Let's get this done.")
     #   => "Let\\'s get this done."
     #
     # @example
-    #  cal.query("* text:'#{escape_single_quotes("Let's go")}'")
+    #  query("* text:'#{escape_single_quotes("Let's go")}'")
     #  # Equivalent to
-    #  cal.query("* text:'Let\\'s go'")
+    #  query("* text:'Let\\'s go'")
     #
     # @param [String] string The string to escape.
     # @return [String] A string with its single quotes properly escaped.
@@ -122,7 +109,7 @@ module Calabash
     # @param [Number] timeout How long to wait for the keyboard.
     # @raise [Calabash::Wait::TimeoutError] Raises error if no keyboard
     #  appears.
-    def wait_for_keyboard(timeout: nil)
+    def wait_for_keyboard(timeout=nil)
       keyboard_timeout = keyboard_wait_timeout(timeout)
       message = "Timed out after #{keyboard_timeout} seconds waiting for the keyboard to appear"
       wait_for(message, timeout: keyboard_timeout) do
@@ -137,7 +124,7 @@ module Calabash
     # @param [Number] timeout How log to wait for the keyboard to disappear.
     # @raise [Calabash::Wait::TimeoutError] Raises error if any keyboard is
     #  visible after the `timeout`.
-    def wait_for_no_keyboard(timeout: nil)
+    def wait_for_no_keyboard(timeout=nil)
       keyboard_timeout = keyboard_wait_timeout(timeout)
       message = "Timed out after #{keyboard_timeout} seconds waiting for the keyboard to disappear"
       wait_for(message, timeout: keyboard_timeout) do
@@ -145,32 +132,33 @@ module Calabash
       end
     end
 
-    define_method(:_enter_text) do |text|
+    # @!visibility private
+    def _enter_text(text)
       abstract_method!
     end
 
     # @!visibility private
-    define_method(:_enter_text_in) do |view, text|
+    def _enter_text_in(view, text)
       abstract_method!
     end
 
     # @!visibility private
-    define_method(:_clear_text) do
+    def _clear_text
       abstract_method!
     end
 
     # @!visibility private
-    define_method(:_clear_text_in) do |view|
+    def _clear_text_in(view)
       abstract_method!
     end
 
     # @!visibility private
-    define_method(:_tap_keyboard_action_key) do |action_key|
+    def _tap_keyboard_action_key(action_key)
       abstract_method!
     end
 
     # @!visibility private
-    define_method(:_keyboard_visible?) do
+    def _keyboard_visible?
       abstract_method!
     end
 
@@ -180,7 +168,7 @@ module Calabash
     end
 
     # @!visibility private
-    define_method(:keyboard_wait_timeout) do |timeout|
+    def keyboard_wait_timeout(timeout)
       if timeout.nil?
         Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
       else

data/lib/calabash/utility.rb

@@ -7,15 +7,16 @@ module Calabash
 
   # Utility methods for testing.
   module Utility
+
     # @!visibility private
-    def abstract_method!(method_name=nil)
-      method_name ||= if Kernel.method_defined?(:caller_locations)
+    def abstract_method!
+      method_name = if Kernel.method_defined?(:caller_locations)
                       caller_locations.first.label
                     else
                       caller.first[/\`(.*)\'/, 1]
                     end
 
-      raise AbstractMethodError.new("Abstract method '#{method_name.to_s}'")
+      raise AbstractMethodError.new("Abstract method '#{method_name}'")
     end
 
     # @!visibility private
@@ -26,8 +27,8 @@ module Calabash
     #
     # @example
     #  # These are equivalent.
-    #  cal.pan("*", percent(20, 50), percent(20, 100))
-    #  cal.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.
@@ -43,8 +44,8 @@ module Calabash
     #
     # @example
     #  # These are equivalent.
-    #  cal.tap("button", offset: coordinate(20, 50))
-    #  cal.tap("button", 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.
@@ -54,39 +55,5 @@ module Calabash
     end
 
     alias_method :coord, :coordinate
-
-    # @!visibility private
-    # Sets the default values for a hash. The hash is not mutated by duplicated
-    #
-    # @example
-    #  default_hash_values({a: 'b'}, {a: 'q', b: 'c'}) # => {a: 'b', b: 'c'}
-    #
-    # @notice
-    #  This method does not overwrite nil
-    def self.default_hash_values(hash, defaults)
-      res = hash.dup
-
-      defaults.each do |key, value|
-        unless res.key?(key)
-          res[key] = value
-        end
-      end
-
-      res
-    end
-
-    # @!visibility private
-    def self.used_bundler?
-      defined?(Bundler) && !ENV['BUNDLE_BIN_PATH'].nil?
-    end
-
-    # @!visibility private
-    def self.bundle_exec_prepend
-      if used_bundler?
-        'bundle exec '
-      else
-        ''
-      end
-    end
   end
 end

data/lib/calabash/version.rb

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