calabash-cucumber 0.9.113 → 0.9.115

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.112)
+    calabash-cucumber (0.9.115)
       CFPropertyList
       bundler (~> 1.1)
       cucumber
-      httpclient (~> 2.2)
+      httpclient (= 2.2.7)
       json
-      location-one (~> 0.0.7)
+      location-one (~> 0.0.8)
       sim_launcher (= 0.4.6)
       slowhandcuke
 
@@ -25,11 +25,11 @@ GEM
     geocoder (1.1.4)
     gherkin (2.11.5)
       json (>= 1.4.6)
-    httpclient (2.3.0.1)
+    httpclient (2.2.7)
     json (1.7.5)
-    location-one (0.0.7)
+    location-one (0.0.8)
       geocoder (~> 1.1)
-      httpclient (~> 2.2)
+      httpclient (= 2.2.7)
       json
     rack (1.4.1)
     rack-protection (1.2.0)

data/calabash-cucumber.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.add_dependency( "CFPropertyList" )
   s.add_dependency( "sim_launcher", "0.4.6")
   s.add_dependency( "slowhandcuke" )
-  s.add_dependency( "location-one", "~>0.0.7")
-  s.add_dependency( "httpclient","~> 2.2")
+  s.add_dependency( "location-one", "~>0.0.8")
+  s.add_dependency( "httpclient","2.2.7")
   s.add_dependency( "bundler", "~> 1.1")
 
 end

data/lib/calabash-cucumber/core.rb

@@ -18,6 +18,14 @@ module Calabash
         map(uiquery, :query, *args)
       end
 
+      def server_version
+        JSON.parse(http(:path => 'version'))
+      end
+
+      def client_version
+        Calabash::Cucumber::VERSION
+      end
+
       def perform(*args)
         if args.length == 1
           #simple selector
@@ -28,7 +36,7 @@ module Calabash
           args = [hash]
         elsif args.length == 2
           q = args[1][:on]
-          if args[0].is_a?Hash
+          if args[0].is_a? Hash
             args = [args[0]]
           else
             args = args[0]
@@ -113,6 +121,35 @@ module Calabash
         views_touched
       end
 
+      def scroll_to_cell(options={:query => "tableView",
+                                  :row => 0,
+                                  :section => 0,
+                                  :scroll_position => :top,
+                                  :animate => true})
+        uiquery = options[:query] || "tableView"
+        row = options[:row]
+        sec = options[:section]
+        if row.nil? or sec.nil?
+          raise "You must supply both :row and :section keys to scroll_to_cell"
+        end
+
+        args = []
+        if options.has_key?(:scroll_position)
+          args << options[:scroll_position]
+        else
+          args << "top"
+        end
+        if options.has_key?(:animate)
+          args << options[:animate]
+        end
+        views_touched=map(uiquery, :scrollToRow, row.to_i, sec.to_i, *args)
+
+        if views_touched.empty? or views_touched.member? "<VOID>"
+          screenshot_and_raise "Unable to scroll: '#{uiquery}' to: #{options}"
+        end
+        views_touched
+      end
+
       def pinch(in_out, options={})
         file = "pinch_in"
         if in_out.to_sym==:out
@@ -186,7 +223,7 @@ module Calabash
         dir = opts[:dir] || :down
 
         raise "Wheel index must be non negative" if wheel < 0
-        raise "Only up and down supported :dir (#{dir})" unless [:up,:down].include?(dir)
+        raise "Only up and down supported :dir (#{dir})" unless [:up, :down].include?(dir)
 
         if ENV['OS'] == "ios4"
           playback "wheel_#{dir}", :query => "#{q} pickerTable index:#{wheel}"
@@ -223,7 +260,7 @@ module Calabash
                                          {:titleForRow => i},
                                          {:forComponent => comp}]).first
             end
-             texts[comp] << txt
+            texts[comp] << txt
           end
         end
         texts
@@ -305,7 +342,7 @@ module Calabash
         file_name = "#{file_name}_#{os}_#{device}.base64"
         system("/usr/bin/plutil -convert binary1 -o _recording_binary.plist _recording.plist")
         system("openssl base64 -in _recording_binary.plist -out #{file_name}")
-          system("rm _recording.plist _recording_binary.plist")
+        system("rm _recording.plist _recording_binary.plist")
         file_name
       end
 

data/lib/calabash-cucumber/tests_helpers.rb

@@ -60,6 +60,47 @@ module Calabash
         screenshot_and_raise(msg, options)
       end
 
+      def each_cell(opts={:query => "tableView", :post_scroll => 0.3, :animate => true}, &block)
+        uiquery = opts[:query] || "tableView"
+        skip = opts[:skip_if]
+        check_element_exists(uiquery)
+        secs = query(uiquery,:numberOfSections).first
+        secs.times do |sec|
+          rows = query(uiquery,{:numberOfRowsInSection => sec}).first
+          rows.times do |row|
+            next if skip and skip.call(row,sec)
+            scroll_opts = {:section => sec, :row => row}.merge(opts)
+            scroll_to_cell(scroll_opts)
+            sleep(opts[:post_scroll]) if opts[:post_scroll] and opts[:post_scroll] > 0
+            yield(row, sec)
+          end
+        end
+      end
+
+      def each_cell_and_back(opts={:query => "tableView",
+                                   :post_scroll => 0.3,
+                                   :post_back => 0.5,
+                                   :post_tap_cell => 0.3,
+                                   :animate => true}, &block)
+        back_query = opts[:back_query] || "navigationItemButtonView"
+        post_tap_cell = opts[:post_tap_cell] || 0.3
+        post_back = opts[:post_back] || 0.6
+
+
+        each_cell(opts) do |row, sec|
+          touch("tableViewCell indexPath:#{row},#{sec}")
+          wait_for_elements_exist([back_query])
+          sleep(post_tap_cell) if post_tap_cell > 0
+
+          yield(row,sec) if block_given?
+
+          touch(back_query)
+
+          sleep(post_back) if post_back > 0
+
+        end
+      end
+
 
       def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
         path = screenshot(options)

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.113"
-    FRAMEWORK_VERSION = "0.9.111"
+    VERSION = "0.9.115"
+    FRAMEWORK_VERSION = "0.9.115"
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -85,6 +85,11 @@ module Calabash
         options[:timeout_message] = options[:timeout_message] || "Timeout waiting for condition (#{options[:condition]})"
         options[:screenshot_on_error] = options[:screenshot_on_error] || true
 
+        if options[:condition] == CALABASH_CONDITIONS[:none_animating]
+          puts "Waiting for none-animating has been found unreliable."
+          puts "You are advised not to use it until this is resolved."
+          puts "Test will continue..."
+        end
         begin
           Timeout::timeout(options[:timeout],WaitError) do
             loop do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.113
+  version: 0.9.115
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,23 +106,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement