briar 0.0.7 → 0.0.8

data/lib/briar/picker/picker.rb

@@ -28,5 +28,15 @@ module Briar
       titles = visible_titles column
       titles[selected_idx]
     end
+
+    def scroll_picker(dir, picker_id)
+      should_see_picker picker_id
+      if dir.eql? 'down'
+        picker_scroll_down_on_column 0
+      else
+        picker_scroll_up_on_column 0
+      end
+      step_pause
+    end
   end
 end

data/lib/briar/table.rb

@@ -2,97 +2,126 @@
 
 module Briar
   module Table
-    def query_str_row_in_table (row_id, table_id = nil)
+
+    def query_str_for_row_content (row_id, table_id = nil)
+      base = query_str_for_row row_id, table_id
+      "#{base} tableViewCellContentView descendant"
+    end
+
+    def query_str_for_row (row_id, table_id = nil)
       table_id == nil ?
             "tableViewCell marked:'#{row_id}'" :
-            "tableView marked:'#{table_id}' child tableViewCell marked:'#{row_id}'"
+            "tableView marked:'#{table_id}' descendant tableViewCell marked:'#{row_id}'"
     end
 
-    def query_str_rows_in_table (table_id = nil)
+    def query_str_for_rows (table_id = nil)
       table_id == nil ?
             'tableViewCell' :
-            "tableView marked:'#{table_id}' child tableViewCell"
+            "tableView marked:'#{table_id}' descendant tableViewCell"
     end
 
-    def query_str_table (table_id = nil)
+    def query_str_for_table (table_id = nil)
       table_id == nil ?
             'tableView' :
             "tableView marked:'#{table_id}'"
     end
 
-    def row_exists? (row_id, table_id = nil)
-      query_str = query_str_row_in_table row_id, table_id
-      exists = !query(query_str, :accessibilityIdentifier).empty?
-      # if row cannot be found just return false
-      return false unless exists
-
-      all_rows = query(query_str_rows_in_table(table_id), :accessibilityIdentifier)
-      index = all_rows.index(row_id)
-
-      # problems only happen if we are dealing with the first or last index
-      return exists if index != 0 and  index != (all_rows.length - 1)
+    def table_has_calabash_additions
+      success_value = '1'
+      res = query('tableView', [{hasCalabashAdditions: success_value}])
+      screenshot_and_raise 'table is not visible' if res.empty?
+      res.first.eql? success_value
+    end
 
-      if index == 0 or index == (all_rows.length - 1)
-        # collect information about the table, row, and content offset
-        content_offset_y = query('tableView', :contentOffset).first['Y']
-        frame = query(query_str).first['frame']
-        cell_h = frame['height'].to_f
-        cell_y = frame['y'].to_f
-        table_h = query(query_str_table(table_id)).first['frame']['height']
+    #noinspection RubyUnusedLocalVariable
+    def row_exists? (row_id, table_id = nil)
+      pending "deprecated 0.0.8 - use 'row_visible?' instead"
+    end
 
-        # if the row is the first row and there has been no scrolling, just return true
-        return true if index == 0 and content_offset_y == 0
-        # if the row is the first row and more than half of it is visible
-        return (content_offset_y + cell_y + (cell_h/2.0))/content_offset_y >= 2.0 if index == 0
-        # if the row is the last row and more than half of it is visible
-        return (table_h - (cell_y - content_offset_y))/(cell_h/2.0) >= 1.0 if index == (all_rows.length - 1)
-      end
+    def row_visible? (row_id, table_id = nil)
+      query_str = query_str_for_row row_id, table_id
+      !query(query_str, AI).empty?
+
+      #query_str = query_str_row_in_table row_id, table_id
+      #exists = !query(query_str, AI).empty?
+      ## if row cannot be found just return false
+      #return false unless exists
+      #
+      #all_rows = query(query_str_rows_in_table(table_id), AI)
+      #index = all_rows.index(row_id)
+      #
+      ## problems only happen if we are dealing with the first or last index
+      #return exists if index != 0 and  index != (all_rows.length - 1)
+      #
+      #if index == 0 or index == (all_rows.length - 1)
+      #  # collect information about the table, row, and content offset
+      #  content_offset_y = query('tableView', :contentOffset).first['Y']
+      #  frame = query(query_str).first['frame']
+      #  cell_h = frame['height'].to_f
+      #  cell_y = frame['y'].to_f
+      #  table_h = query(query_str_table(table_id)).first['frame']['height']
+      #
+      #  # if the row is the first row and there has been no scrolling, just return true
+      #  return true if index == 0 and content_offset_y == 0
+      #  # if the row is the first row and more than half of it is visible
+      #  return (content_offset_y + cell_y + (cell_h/2.0))/content_offset_y >= 2.0 if index == 0
+      #  # if the row is the last row and more than half of it is visible
+      #  return (table_h - (cell_y - content_offset_y))/(cell_h/2.0) >= 1.0 if index == (all_rows.length - 1)
+      #end
     end
 
     def should_see_row (row_id, table_id = nil)
-      unless row_exists? row_id, table_id
-        screenshot_and_raise "i do not see a row named #{row_id}"
+      unless row_visible? row_id, table_id
+        screenshot_and_raise "i do not see a row '#{row_id}'"
       end
     end
 
 
-    def should_not_see_row(row_id)
-      if row_exists? row_id
+    def should_not_see_row(row_id, table_id=nil)
+      if row_visible? row_id, table_id
         screenshot_and_raise "i should not have seen row named #{row_id}"
       end
     end
 
-    def query_str_for_label_and_text_exists (row_id, label_id, table_id = nil)
-      table_id == nil ?
-            "tableViewCell marked:'#{row_id}' isHidden:0 descendant label marked:'#{label_id}'" :
-            "tableView marked:'#{table_id}' child tableViewCell marked:'#{row_id}' isHidden:0 descendant label marked:'#{label_id}'"
+    def wait_for_row(row_id, options={:table_id => nil,
+                                      :timeout => 1.0})
+      table_id = options[:table_id]
+      query_str = query_str_for_row row_id, table_id
+      timeout = options[:timeout] || 1.0
+      msg = "waited for '#{timeout}' seconds but did not see row '#{query_str}' with query '#{query_str}'"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg ) do
+        row_visible? row_id, table_id
+      end
+    end
+
 
+    def query_str_for_label_and_text_exists (row_id, label_id, table_id = nil)
+      query_str = query_str_for_row_content row_id, table_id
+      "#{query_str} label marked:'#{label_id}'"
     end
 
     def row_with_label_and_text_exists? (row_id, label_id, text, table_id = nil)
       should_see_row row_id
-      #arr = query("tableViewCell marked:'#{row_id}' isHidden:0 descendant label marked:'#{label_id}'", :text)
-      arr = query(query_str_for_label_and_text_exists(row_id, label_id, table_id),  :text)
-      ## iOS 4 and 5
-
+      arr = query(query_str_for_label_and_text_exists(row_id, label_id, table_id), :text)
       (arr.length == 1) and (arr.first.eql? text)
     end
 
-
-
-    def should_see_row_with_label_with_text (row_id, label_id, text)
-      should_see_row row_id
-      unless row_with_label_and_text_exists? row_id, label_id, text
-        actual = query("tableViewCell marked:'#{row_id}' child tableViewCellContentView child label marked:'#{label_id}'", :text).first
+    def should_see_row_with_label_with_text (row_id, label_id, text, table_id=nil)
+      should_see_row row_id, table_id
+      unless row_with_label_and_text_exists? row_id, label_id, text, table_id
+        query_str = query_str_for_row_content row_id, table_id
+        actual = query("#{query_str} label marked:'#{label_id}'", :text).first
         screenshot_and_raise "expected to see row '#{row_id}' with label '#{label_id}' that has text '#{text}', but found '#{actual}'"
       end
     end
 
     def should_see_row_with_image (row_id, image_id, table_id = nil)
       should_see_row row_id, table_id
-      query_base = query_str_row_in_table row_id, table_id
-      query_str = "#{query_base} child tableViewCellContentView child imageView marked:'#{image_id}'"
-      if query(query_str).empty?
+      query_str = query_str_for_row_content row_id, table_id
+      if query("#{query_str} imageView marked:'#{image_id}'").empty?
         if table_id == nil
           screenshot_and_raise "expected to see row '#{row_id}' with image view '#{image_id}'"
         else
@@ -102,13 +131,41 @@ module Briar
     end
 
 
-    def scroll_until_i_see_row (dir, row_id)
-      wait_poll({:until_exists => "tableView descendant tableViewCell marked:'#{row_id}'",
+    def briar_scroll_to_row (row_id, table_id=nil)
+      unless table_id.nil?
+        should_see_table row_id
+      end
+
+      query_str = query_str_for_table table_id
+
+      msg = "could find row marked '#{row_id}' in table '#{query_str}'"
+      options = {:query => query_str,
+                 :scroll_position => :middle,
+                 :animate => true,
+                 :failed_message => msg}
+      scroll_to_row_with_mark row_id, options
+      # you will be tempted to remove this pause - don't.
+      # set :animate => false instead
+      step_pause
+    end
+
+    def briar_scroll_to_row_and_touch (row_id, wait_for_view=nil)
+      briar_scroll_to_row(row_id)
+      if wait_for_view.nil?
+        touch_row row_id
+      else
+        touch_row_and_wait_to_see row_id, wait_for_view
+      end
+    end
+
+    def scroll_until_i_see_row (dir, row_id, table_id=nil)
+      warn "deprecated 0.0.8 - use 'scroll_to_row #{row_id}' with optional table view mark"
+      wait_poll({:until_exists => query_str_for_row(row_id, table_id),
                  :timeout => 2}) do
         scroll('tableView', dir)
       end
 
-      unless row_exists?(row_id)
+      unless row_visible?(row_id)
         screenshot_and_raise "i scrolled '#{dir}' but did not see '#{row_id}'"
       end
     end
@@ -116,10 +173,10 @@ module Briar
 
     def touch_row_offset_hash (row_id, table_id = nil)
       offset = 0
-      query = query_str_row_in_table row_id, table_id
+      query = query_str_for_row row_id, table_id
       if tabbar_visible?
         #puts "tabbar visible"
-        cells = query(query_str_rows_in_table, :accessibilityIdentifier)
+        cells = query(query_str_for_rows, AI)
         #puts "cells = #{cells} is #{row_id} last? ==> #{cells.last.eql?(row_id)}"
         if cells.last.eql?(row_id)
           row_h = query(query, :frame).first['Height'].to_i
@@ -133,7 +190,7 @@ module Briar
     def touch_row (row_id, table_id = nil)
       should_see_row row_id
       offset = touch_row_offset_hash row_id, table_id
-      query_str = query_str_row_in_table(row_id, table_id)
+      query_str = query_str_for_row(row_id, table_id)
       #puts "touch(\"#{query_str}\", :offset => #{offset})"
       touch(query_str, :offset => offset)
       step_pause
@@ -141,15 +198,13 @@ module Briar
 
 
     def touch_row_and_wait_to_see(row_id, view, table_id = nil)
-      should_see_row row_id
+      should_see_row row_id, table_id
       touch_row row_id, table_id
-      wait_for_transition("view marked:'#{view}'",
-                          {:timeout=>TOUCH_TRANSITION_TIMEOUT,
-                           :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+      wait_for_view view, 2.0
     end
 
     def table_exists? (table_name)
-      !query("tableView marked:'#{table_name}'", :accessibilityIdentifier).empty?
+      !query("tableView marked:'#{table_name}'", AI).empty?
     end
 
     def should_see_table (table_name)
@@ -166,64 +221,177 @@ module Briar
       end
     end
 
-    def swipe_on_row (dir, row_name)
-      swipe(dir, {:query => "tableViewCell marked:'#{row_name}'"})
+    def swipe_on_row (dir, row_id, table_id=nil)
+      if device.ios7?
+        pending ('swipe is not available on iOS 7')
+      end
+      query_str = query_str_for_row row_id, table_id
+      swipe(dir, {:query => query_str})
       step_pause
-      @row_that_was_swiped = row_name
+      @row_that_was_swiped = row_id
     end
 
-    def should_not_see_delete_confirmation_in_row(row_name)
-      unless query("tableViewCell marked:'#{row_name}' child tableViewCellDeleteConfirmationControl").empty?
-        screenshot_and_raise "should see a delete confirmation button on row #{row_name}"
+
+    def should_not_see_delete_confirmation_in_row(row_id, table_id=nil)
+      query_str = query_str_for_row row_id, table_id
+      unless query("#{query_str} descendant tableViewCellDeleteConfirmationControl").empty?
+        screenshot_and_raise "should see a delete confirmation button on row #{row_id}"
       end
     end
 
-
-    def should_see_delete_confirmation_in_row(row_name)
-      if query("tableViewCell marked:'#{row_name}' child tableViewCellDeleteConfirmationControl").empty?
-        screenshot_and_raise "should see a delete confirmation button on row '#{row_name}'"
+    def should_see_delete_confirmation_in_row(row_id, table_id=nil)
+      query_str = query_str_for_row row_id, table_id
+      if query("#{query_str} descendant tableViewCellDeleteConfirmationControl").empty?
+        screenshot_and_raise "should see a delete confirmation button on row '#{row_id}'"
       end
     end
 
-    def touch_delete_confirmation(row_name)
-      touch("tableViewCell marked:'#{row_name}' child tableViewCellDeleteConfirmationControl")
+    def touch_delete_confirmation(row_id, table_id=nil)
+      query_str = query_str_for_row row_id, table_id
+      touch("#{query_str} descendant tableViewCellDeleteConfirmationControl")
       step_pause
     end
 
-    def edit_mode_delete_button_exists? (row_name)
-      #!query("tableViewCell marked:'#{row_name}' child tableViewCellEditControl").empty?
-      !query("all tableViewCell marked:'#{row_name}' child tableViewCellEditControl").empty?
+    def edit_mode_delete_button_exists? (row_id, table_id=nil)
+      query_str = query_str_for_row row_id, table_id
+      #!query("all tableViewCell marked:'#{row_id}' child tableViewCellEditControl").empty?
+      !query("#{query_str} descendant tableViewCellEditControl").empty?
+    end
+
+    def should_see_edit_mode_delete_button (row_id, table_id=nil)
+      unless edit_mode_delete_button_exists? row_id, table_id
+        screenshot_and_raise "should see a edit mode delete button on row #{row_id}"
+      end
+    end
+
+    def should_not_see_edit_mode_delete_button (row_id, table_id=nil)
+      if edit_mode_delete_button_exists? row_id, table_id
+        screenshot_and_raise "i should not see an edit mode delete button on row #{row_id}"
+      end
+    end
+
+    def reorder_button_exists? (row_id, table_id=nil)
+      query_str = query_str_for_row row_id, table_id
+      #!query("tableViewCell marked:'#{row_id}' child tableViewCellReorderControl").empty?
+      #!query("all tableViewCell marked:'#{row_id}' child tableViewCellReorderControl").empty?
+      !query("#{query_str} descendant tableViewCellReorderControl").empty?
+    end
+
+    def should_see_reorder_button (row_id, table_id=nil)
+      unless reorder_button_exists? row_id, table_id
+        screenshot_and_raise "i should be able to see reorder button on row #{row_id}"
+      end
     end
 
-    def should_see_edit_mode_delete_button (row_name)
-      unless edit_mode_delete_button_exists? row_name
-        screenshot_and_raise "should see a edit mode delete button on row #{row_name}"
+    def should_not_see_reorder_button (row_id, table_id=nil)
+      if reorder_button_exists? row_id, table_id
+        screenshot_and_raise "i should not see reorder button on row #{row_id}"
       end
     end
 
-    def should_not_see_edit_mode_delete_button (row_name)
-      if edit_mode_delete_button_exists? row_name
-        screenshot_and_raise "i should not see an edit mode delete button on row #{row_name}"
+    def should_see_row_at_index (row_id, index, table_id=nil)
+      query_str = query_str_for_rows table_id
+      res = query(query_str, AI)[index.to_i]
+      unless res.eql? row_id
+        screenshot_and_raise "i should see '#{row_id}' at #{index} in '#{query_str}', but found #{res}"
       end
     end
 
-    def reorder_button_exists? (row_name)
-      #TableViewCellReorderControl
-      #!query("tableViewCell marked:'#{row_name}' child tableViewCellReorderControl").empty?
-      !query("all tableViewCell marked:'#{row_name}' child tableViewCellReorderControl").empty?
+    def touch_edit_mode_delete_button (row_id, table_id=nil)
+      should_see_edit_mode_delete_button row_id, table_id
+      touch("tableViewCell marked:'#{row_id}' child tableViewCellEditControl")
+      step_pause
+      should_see_delete_confirmation_in_row row_id
     end
 
-    def should_see_reorder_button (row_name)
-      unless reorder_button_exists? row_name
-        screenshot_and_raise "i should be able to see reorder button on row #{row_name}"
+    def should_see_switch_in_row_with_state (switch_id, row_id, state, table_id=nil)
+      should_see_row row_id, table_id
+      query_str = query_str_for_row_content row_id, table_id
+      res = query("#{query_str} switch marked:'#{switch_id}'", :isOn).first
+      unless res
+        screenshot_and_raise "expected to find a switch marked '#{switch_id}' in row '#{row_id}'"
       end
+      unless res.to_i == state
+        screenshot_and_raise "expected to find a switch marked '#{switch_id}' in row '#{row_id}' that is '#{state ? 'on' : 'off'}' but found it was '#{res ? 'on' : 'off'}'"
+      end
+    end
+
+    def touch_text_field_clear_button_in_row (row_id, table_id=nil)
+      query_str = query_str_for_row_content row_id, table_id
+      res = query("#{query_str} textField")
+      screenshot_and_raise "expected to see text field in '#{row_id}' row" if res.empty?
+      touch("#{query_str} textField descendant button")
+      step_pause
+    end
+
+    def touch_text_field_in_row_and_wait_for_keyboard (text_field_id, row_id, table_id=nil)
+      should_see_row row_id, table_id
+      query_str = query_str_for_row_content row_id, table_id
+      touch("#{query_str} textField marked:'#{text_field_id}'")
+      step_pause
+      should_see_keyboard
     end
 
-    def should_not_see_reorder_button (row_name)
-      if reorder_button_exists? row_name
-        screenshot_and_raise "i should not see reorder button on row #{row_name}"
+    def should_see_text_field_in_row_with_text (row_id, text_field_id, text, table_id=nil)
+      should_see_row row_id, table_id
+      query_str = "#{query_str_for_row_content row_id, table_id} textField marked:'#{text_field_id}'"
+      res = query(query_str)
+      screenshot_and_raise "expected to see text field in '#{row_id}' row" if res.empty?
+      actual = query(query_str, :text).first
+      screenshot_and_raise "expected to find text field with '#{text}' in row '#{row_id}' but found '#{actual}'" if !text.eql? actual
+    end
+
+    def delete_row_with_edit_mode_delete_button (row_id, table_id=nil)
+      touch_edit_mode_delete_button row_id, table_id
+      touch_delete_confirmation row_id, table_id
+      should_not_see_row row_id, table_id
+    end
+
+    def touch_switch_in_row (switch_id, row_id, table_id=nil)
+      should_see_row row_id, table_id
+      query_str = query_str_for_row_content row_id, table_id
+      touch("#{query_str} switch marked:'#{switch_id}'")
+      step_pause
+    end
+
+    def swipe_to_delete_row (row_id, table_id = nil)
+
+      swipe_on_row 'left', row_id, table_id
+      should_see_delete_confirmation_in_row row_id, table_id
+      touch_delete_confirmation row_id, table_id
+      should_not_see_row row_id, table_id
+    end
+
+    def should_see_disclosure_chevron_in_row (row_id, table_id=nil)
+      should_see_row row_id, table_id
+      # gray disclosure chevron is accessory type 1
+      query_str = query_str_for_row row_id, table_id
+      res = query(query_str, :accessoryType).first
+      unless res == 1
+        screenshot_and_raise "expected to see disclosure chevron in row '#{row_id}' but found '#{res}'"
       end
     end
 
+    def should_see_slider_in_row (slider_id, row_id, table_id)
+      query_str = query_str_for_row_content row_id, table_id
+      actual_id = query("#{query_str} slider marked:'#{slider_id}'", AI).first
+      unless actual_id.eql? row_id
+        screenshot_and_raise "expected to see slider '#{slider_id}' in '#{row_id}' but found '#{actual_id}'"
+      end
+    end
+
+    def should_see_slider_in_row_with_value (slider_id, row_id, value, table_id=nil)
+      query_str = query_str_for_row_content row_id, table_id
+      actual_value = query("#{query_str} slider marked:'#{slider_id}'", :value).first.to_i
+      unless actual_value == value.to_i
+        screenshot_and_raise "expected to see slider '#{slider_id}' with '#{value}' in '#{row_id}' but found '#{actual_value}'"
+      end
+    end
+
+    def touch_section_header (header_id, table_id=nil)
+      query_str = query_str_for_table table_id
+      touch("#{query_str} descendant view marked:'#{header_id}'")
+      step_pause
+    end
   end
 end