calabash 2.0.0.pre3 → 2.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99f4bb2a90e0b3d0e826f6afe73b213a36e984e0
-  data.tar.gz: 2056799cd44ee3504b986351da16bb834f72e382
+  metadata.gz: 46648485266c6c561e26a5b25214c4b75efc0f18
+  data.tar.gz: e128516fcd291fe34c8e4322041b170966c53493
 SHA512:
-  metadata.gz: 1ba0e8c86de9a8682affd9712cbfc4d7b50bf472bc285c8375e210ae5f99146910f6229ff140cc316ab6dea697ecfbc0bc75e415f750b8706940981080bfa2a1
-  data.tar.gz: 2a71fcf01eb79e7cb15d294a70b7cd9ba42111c09ef82966e4b9d7522221e7b726df29483683b6ef6640412b75f2e2edc80c0e4084567d57a02b1a1c68102140
+  metadata.gz: 39c208b6932d9ed0940a25e9bf6fe8fe7688c49cda6b12ee0f97e1063fd038f8ca540d1fbc73609185cfc6cd52b3f20cc4e444570774e7182dfcf5a3bb4c1792
+  data.tar.gz: 57d8c44ed1996097fec90970f6757a4e423f1cc0f41646a866715e0f1edeabfd53e266f5c06ed278f00bf64b26d17936b4acf413ed10f85f321cd5fcaa18aec2

data/lib/calabash/android/scroll.rb

@@ -0,0 +1,115 @@
+module Calabash
+  module Android
+    # Scrolling invokes methods on the views to get to the right items. This
+    # behaviour is not doable by the users. For real gestures interacting with
+    # the screen, see {Calabash::Gestures}.
+    module Scroll
+      # Scroll the first view matched by `query` in `direction`.
+      #
+      # @param [String, Hash, Calabash::Query] query A query describing the
+      # view to scroll.
+      # @param [Symbol] direction The direction to scroll. Valid directions are:
+      #  :up, :down, :left, and :right
+      def scroll(query, direction)
+        allowed_directions = [:up, :down, :left, :right]
+
+        dir_symbol = direction.to_sym
+
+        unless allowed_directions.include?(dir_symbol)
+          raise ArgumentError,
+                "Expected '#{direction}' to be one of #{allowed_directions.join(',')}"
+        end
+
+        view = wait_for_view(query, timeout: Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT)
+
+        result = query("#{Query.new(query)} index:0", :getFirstVisiblePosition)
+
+        if result.length == 0
+          raise "Failed to scroll view '#{query}'"
+        end
+
+        if result.first.is_a?(Hash) && result.first.has_key?("error")
+          # View is not of type android.widget.AbsListView
+          scroll_x = 0
+          scroll_y = 0
+          width = view['rect']['width']
+          height = view['rect']['height']
+
+          if direction == :up
+            scroll_y = -height / 2
+          elsif direction == :down
+            scroll_y = height / 2
+          elsif direction == :left
+            scroll_x = -width / 2
+          elsif direction == :right
+            scroll_x = width / 2
+          end
+
+          result = query("#{Query.new(query)} index:0", {scrollBy: [scroll_x.to_i, scroll_y.to_i]})
+
+          if result.length == 0
+            raise "Failed to scroll view '#{query}'"
+          end
+
+          if result.first.is_a?(Hash) && result.first.has_key?('error')
+            raise "Failed to scroll view: #{result.first['error']}"
+          end
+        else
+          # View is of type android.widget.AbsListView
+          unless [:up, :down].include?(dir_symbol)
+            raise ArgumentError,
+                  "Can only scroll listviews :up or :down, not #{direction}"
+          end
+
+          first_position = result.first.to_i
+          result = query("#{Query.new(query)} index:0", :getLastVisiblePosition)
+
+          if result.length == 0
+            raise "Failed to scroll view '#{Query.new(query)}'"
+          end
+
+          last_position = result.first.to_i
+
+
+          selection_index = if direction == :up
+                              [first_position + [first_position - last_position + 1, -1].min, 0].max
+                            elsif direction == :down
+                              first_position + [last_position - first_position, 1].max
+                            end
+
+          result = query("#{Query.new(query)} index:0", setSelection: selection_index)
+
+          if result.length == 0
+            raise "Failed to scroll view '#{query}'"
+          end
+        end
+
+        true
+      end
+
+      # Scroll to `item` in `query`. If `query` matches multiple views, the
+      # first view matching `query` is scrolled.
+      #
+      # @param [String, Hash, Calabash::Query] query A query describing the
+      #  view to scroll.
+      # @param [Numeric] item The item number to scroll to. This value is
+      #  0-indexed.
+      def scroll_to_row(query, item)
+        wait_for_view(query, timeout: Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT)
+        result = query("#{Query.new(query)} index:0", setSelection: item)
+
+        if result.length == 0
+          raise "Failed to scroll view '#{query}'"
+        end
+
+        result.length.times do |i|
+          if result[i].is_a?(Hash) && result[i].has_key?('error')
+            raise "Unable to scroll view number '#{i}' matching '#{query}'. #{result[i]['error']}"
+          end
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/calabash/android.rb

@@ -38,6 +38,7 @@ module Calabash
     require 'calabash/android/text'
     require 'calabash/android/console_helpers'
     require 'calabash/android/life_cycle'
+    require 'calabash/android/scroll'
 
     include Calabash::Android::Gestures
     include Calabash::Android::Interactions
@@ -45,6 +46,7 @@ module Calabash
     include Calabash::Android::Orientation
     include Calabash::Android::PhysicalButtons
     include Calabash::Android::Text
+    include Calabash::Android::Scroll
 
     # @!visibility private
     def self.binary_location(name, abi, using_pie)

data/lib/calabash/ios/device/device_implementation.rb

@@ -78,7 +78,7 @@ module Calabash
         identifier = Environment::DEVICE_IDENTIFIER
 
         if identifier.nil?
-          connected_devices = RunLoop::XCTools.new.instruments(:devices)
+          connected_devices = RunLoop::Instruments.new.physical_devices
           if connected_devices.empty?
             raise 'There are no physical devices connected.'
           elsif connected_devices.count > 1
@@ -639,8 +639,8 @@ module Calabash
       # @!visibility private
       # Very expensive!
       def Device.fetch_matching_physical_device(udid_or_name)
-        xctools = RunLoop::XCTools.new
-        xctools.instruments(:devices).detect do |device|
+        instruments = RunLoop::Instruments.new
+        instruments.physical_devices.detect do |device|
           device.name == udid_or_name ||
                 device.udid == udid_or_name
         end

data/lib/calabash/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.0.pre4
 platform: ruby
 authors:
 - Jonas Maturana Larsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -93,7 +93,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -103,7 +103,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -411,6 +411,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