briar 0.0.8 → 0.0.9

data/lib/briar/keyboard.rb

@@ -1,64 +1,51 @@
-
-
-
 module Briar
   module Keyboard
-    # these are not ready for prime time# the methods for setting auto correct, spell check, etc. are not ready
+    # dismiss the keyboard on iPad
+    # send_uia_command command:"uia.keyboard().buttons()['Hide keyboard'].tap()"
+
+    # these are not ready for prime time
+    # the methods for setting auto correct, spell check, etc. are not ready
     UITextAutocapitalizationTypeNone = 0
     UITextAutocapitalizationTypeWords = 1
     UITextAutocapitalizationTypeSentences = 2
     UITextAutocapitalizationTypeAllCharacters = 3
 
+    UITextAutocorrectionTypeYes = 0
     UITextAutocorrectionTypeNo = 1
-    UITextAutocorrectionTypeYes = 2
+
 
     UITextSpellCheckingTypeNo = 1
     UITextSpellCheckingTypeYes = 2
 
     @text_entered_by_keyboard = ''
 
-    def should_see_keyboard (timeout=1.0)
+    def should_see_keyboard (timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see keyboard"
       wait_for(:timeout => timeout,
                :retry_frequency => 0.2,
                :post_timeout => 0.1,
-               :timeout_message => msg ) do
+               :timeout_message => msg) do
         element_exists('keyboardAutomatic')
       end
     end
 
-    def should_not_see_keyboard (timeout=1.0)
+    def should_not_see_keyboard (timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but keyboard did not disappear"
       wait_for(:timeout => timeout,
                :retry_frequency => 0.2,
                :post_timeout => 0.1,
-               :timeout_message => msg ) do
+               :timeout_message => msg) do
         element_does_not_exist 'keyboardAutomatic'
       end
     end
 
     def briar_keyboard_enter_text (text)
-      if device.ios7?
-        pending('keyboard playback is not available on iOS 7')
-      end
-      @text_entered_by_keyboard = keyboard_enter_text text
+      keyboard_enter_text text
+      # not ideal, but entering text by uia keyboard will never return what
+      # was text was actually input to the keyboard
+      @text_entered_by_keyboard = text
     end
 
-    def briar_keyboard_set_text (text, view_id, &do_for_each_char)
-      unless device.ios7?
-        warn 'this is hack for iOS 7 (playback not available yet) - use briar_keyboard_enter_text'
-      end
-
-      query_str = "view marked:'#{view_id}'"
-      accum = ''
-      text.chars.to_a.each { |char|
-        accum << char
-        query(query_str, {setText:accum})
-        do_for_each_char.call(view_id, accum)
-        @text_entered_by_keyboard = accum
-        sleep(0.05)
-      }
-    end
 
     # is it possible to find what view the keyboard is responding to?
     def autocapitalization_type ()
@@ -71,11 +58,21 @@ module Briar
       end
     end
 
+    def auto_correct_type()
+      if !query('textView index:0').empty?
+        query('textView index:0', :autocorrectionType).first.to_i
+      elsif !query('textField index:0').empty?
+        query('textField index:0', :autocorrectionType).first.to_i
+      else
+        screenshot_and_raise 'could not find a text view or text field'
+      end
+    end
+
     def set_autocapitalization (type)
       if !query('textView index:0').empty?
-        query('textView index:0', [{setAutocapitalizationType:type}])
+        query('textView index:0', [{setAutocapitalizationType: type}])
       elsif !query('textField index:0').empty?
-        query('textField index:0', [{setAutocapitalizationType:type}])
+        query('textField index:0', [{setAutocapitalizationType: type}])
       else
         screenshot_and_raise 'could not find a text view or text field'
       end
@@ -87,9 +84,9 @@ module Briar
 
     def set_autocorrect (type)
       if !query('textView index:0').empty?
-        query('textView index:0',  [{setAutocorrectionType:type}])
+        query('textView index:0', [{setAutocorrectionType: type}])
       elsif !query('textField index:0').empty?
-        query('textField index:0', [{setAutocorrectionType:type}])
+        query('textField index:0', [{setAutocorrectionType: type}])
       else
         screenshot_and_raise 'could not find a text view or text field'
       end
@@ -101,20 +98,23 @@ module Briar
 
     def turn_spell_correct_off
       if !query('textView index:0').empty?
-        query('textView index:0', [{setSpellCheckingType:UITextSpellCheckingTypeNo}])
+        query('textView index:0', [{setSpellCheckingType: UITextSpellCheckingTypeNo}])
       elsif !query('textField index:0').empty?
-        query('textField index:0', [{setSpellCheckingType:UITextSpellCheckingTypeNo}])
+        query('textField index:0', [{setSpellCheckingType: UITextSpellCheckingTypeNo}])
       else
         screenshot_and_raise 'could not find a text view or text field'
       end
     end
 
-
-
-    def clear_text(uiquery)
-      text_fields_modified = map(uiquery, :setText, '')
-      screenshot_and_raise "could not find text field #{uiquery}" if text_fields_modified.empty?
-      text_fields_modified
+    def briar_clear_text(view_id)
+      wait_for_view view_id
+      touch("view marked:'#{view_id}'")
+      wait_for_button 'Select All'
+      step_pause
+      touch_button_and_wait_for_view 'Select All', 'Cut'
+      step_pause
+      touch_button 'Cut'
+      step_pause
     end
 
     #def is_capitalize_none (cap_type)

data/lib/briar/label.rb

@@ -1,5 +1,3 @@
-require "calabash-cucumber"
-
 module Briar
   module Label
     def label_exists? (name)
@@ -31,7 +29,7 @@ module Briar
       end
     end
 
-    def wait_for_label (label_id, timeout=1.0)
+    def wait_for_label (label_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see label '#{label_id}'"
       wait_for(:timeout => timeout,
                :retry_frequency => 0.2,

data/lib/briar/picker/date_picker.rb

@@ -25,8 +25,16 @@ module Briar
       include Briar::Picker::DateCore
       include Briar::Picker::DateManipulation
 
-      # requires a time or date change.  picker does not need to be visible
+      def should_see_label_has_time_i_just_entered (label_id)
+        should_see_label label_id
+        query_str = "label marked:'#{label_id}'"
+        actual_text = query(query_str, :text).first
+        unless (actual_text.eql? @date_picker_time_12h) or (actual_text.eql? @date_picker_time_24h)
+          screenshot_and_raise "expected to see '#{@date_picker_time_12h}' or '#{@date_picker_time_24h}' in '#{label_id}' but found '#{actual_text}'"
+        end
+      end
 
+      # requires a time or date change.  picker does not need to be visible
       def should_see_row_has_time_i_just_entered (row_id, label_id, table_id=nil)
         query_str = query_str_for_row row_id, table_id
         arr = query("#{query_str} descendant label marked:'#{label_id}'", :text)

data/lib/briar/picker/date_picker_manipulation.rb

@@ -115,14 +115,14 @@ module Briar
       # pickers that use utc (reminders, alerts, etc.  do no usually have
       # min/max dates
       def ensure_can_change_picker_to_date(target_dt, picker_id=nil)
-        max_date = picker_maximum_date_time picker_id
+        max_date = maximum_date_time_from_picker picker_id
         if max_date and target_dt > max_date
           p "target: '#{target_dt}'"
           p "   max: '#{max_date}'"
           screenshot_and_raise "cannot change time to '#{target_dt}' because the picker has a maximum date of '#{max_date}'"
         end
 
-        min_date = picker_minimum_date_time picker_id
+        min_date = minimum_date_time_from_picker picker_id
         if min_date and target_dt < min_date
           p "target: '#{target_dt}'"
           p "   min: '#{min_date}'"

data/lib/briar/table.rb

@@ -1,11 +1,10 @@
-#require 'calabash-cucumber'
-
 module Briar
+  #noinspection ALL
   module Table
 
     def query_str_for_row_content (row_id, table_id = nil)
       base = query_str_for_row row_id, table_id
-      "#{base} tableViewCellContentView descendant"
+      "#{base} descendant"
     end
 
     def query_str_for_row (row_id, table_id = nil)
@@ -71,12 +70,9 @@ module Briar
     end
 
     def should_see_row (row_id, table_id = nil)
-      unless row_visible? row_id, table_id
-        screenshot_and_raise "i do not see a row '#{row_id}'"
-      end
+      wait_for_row(row_id, {:table_id => table_id})
     end
 
-
     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}"
@@ -84,15 +80,15 @@ module Briar
     end
 
     def wait_for_row(row_id, options={:table_id => nil,
-                                      :timeout => 1.0})
+                                      :timeout => BRIAR_WAIT_TIMEOUT})
       table_id = options[:table_id]
       query_str = query_str_for_row row_id, table_id
-      timeout = options[:timeout] || 1.0
+      timeout = options[:timeout] || BRIAR_WAIT_TIMEOUT
       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
+               :timeout_message => msg) do
         row_visible? row_id, table_id
       end
     end
@@ -118,6 +114,21 @@ module Briar
       end
     end
 
+    def should_see_row_with_label_that_has_no_text(row_id, label_id)
+      wait_for_row row_id
+      qstr = "#{query_str_for_row_content row_id} label marked:'#{label_id}'"
+      res = query(qstr, :text)
+      if res.empty?
+        screenshot_and_raise "expected to see row '#{row_id}' with label '#{label_id}'"
+      end
+
+      text = res.first
+      unless text.nil? or text.eql?('')
+        screenshot_and_raise "expected to see no text in row '#{row_id}' in label '#{label_id}' but found '#{text}'"
+      end
+    end
+
+
     def should_see_row_with_image (row_id, image_id, table_id = nil)
       should_see_row row_id, table_id
       query_str = query_str_for_row_content row_id, table_id
@@ -189,6 +200,7 @@ module Briar
 
     def touch_row (row_id, table_id = nil)
       should_see_row row_id
+      step_pause
       offset = touch_row_offset_hash row_id, table_id
       query_str = query_str_for_row(row_id, table_id)
       #puts "touch(\"#{query_str}\", :offset => #{offset})"
@@ -200,7 +212,7 @@ module Briar
     def touch_row_and_wait_to_see(row_id, view, table_id = nil)
       should_see_row row_id, table_id
       touch_row row_id, table_id
-      wait_for_view view, 2.0
+      wait_for_view view, 3.0
     end
 
     def table_exists? (table_name)
@@ -222,9 +234,10 @@ module Briar
     end
 
     def swipe_on_row (dir, row_id, table_id=nil)
-      if device.ios7?
-        pending ('swipe is not available on iOS 7')
+      if device.ios7? and device.simulator?
+        pending('swiping on rows is not available on iOS 7 because of a bug in Xcode 5 simulator')
       end
+      wait_for_row row_id, {:table_id => table_id}
       query_str = query_str_for_row row_id, table_id
       swipe(dir, {:query => query_str})
       step_pause
@@ -239,23 +252,33 @@ module Briar
       end
     end
 
+    def query_str_for_confirm_delete_in_row(row_id, table_id=nil)
+      mark = device.ios7? ? 'Delete' : 'Confirm Deletion'
+      "#{query_str_for_row row_id, table_id} descendant control marked:'#{mark}'"
+    end
+
     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}'"
+      query_str = query_str_for_confirm_delete_in_row(row_id, table_id)
+      timeout = 5
+      msg = "waited for '#{timeout}' seconds but did not see 'Delete' confirmation in row '#{row_id}'"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg) do
+        element_exists query_str
       end
     end
 
     def touch_delete_confirmation(row_id, table_id=nil)
-      query_str = query_str_for_row row_id, table_id
-      touch("#{query_str} descendant tableViewCellDeleteConfirmationControl")
+      query_str = query_str_for_confirm_delete_in_row(row_id, table_id)
+      touch(query_str)
       step_pause
     end
 
     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?
+      # note the extra space on the Delete
+      !query("#{query_str} descendant tableViewCellEditControl marked:'Delete '").empty?
     end
 
     def should_see_edit_mode_delete_button (row_id, table_id=nil)
@@ -272,8 +295,6 @@ module Briar
 
     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
 
@@ -299,8 +320,8 @@ module Briar
 
     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
+      touch("tableViewCell marked:'#{row_id}' descendant tableViewCellEditControl marked:'Delete '")
+      # this is a wait function - so no step pause is necessary
       should_see_delete_confirmation_in_row row_id
     end
 
@@ -343,7 +364,9 @@ module Briar
 
     def delete_row_with_edit_mode_delete_button (row_id, table_id=nil)
       touch_edit_mode_delete_button row_id, table_id
+      2.times { step_pause }
       touch_delete_confirmation row_id, table_id
+      2.times { step_pause }
       should_not_see_row row_id, table_id
     end
 
@@ -355,10 +378,12 @@ module Briar
     end
 
     def swipe_to_delete_row (row_id, table_id = nil)
-
+      step_pause
       swipe_on_row 'left', row_id, table_id
+      step_pause
       should_see_delete_confirmation_in_row row_id, table_id
       touch_delete_confirmation row_id, table_id
+      step_pause
       should_not_see_row row_id, table_id
     end
 
@@ -393,5 +418,11 @@ module Briar
       touch("#{query_str} descendant view marked:'#{header_id}'")
       step_pause
     end
+
+    def touch_button_in_row(button_id, row_id, table_id=nil)
+      query_str = query_str_for_table(table_id)
+      touch("#{query_str} descendant button marked:'#{button_id}'")
+      step_pause
+    end
   end
 end

data/lib/briar/text_field.rb

@@ -1,4 +1,4 @@
-require "calabash-cucumber"
+require 'calabash-cucumber'
 
 module Briar
   module TextField
@@ -22,10 +22,12 @@ module Briar
 
     def button_in_text_field_is_clear? (text_field_id)
       ht = query("textField marked:'#{text_field_id}' child button child imageView", :frame).first
-      if !ht.nil?
-        ht["X"] == 0 and ht["Y"] == 0 and ht["Width"] == 19 and ht["Height"] == 19
+      return false if ht.nil?
+
+      if device.ios7?
+        ht['X'] == 2.5 and ht['Y'] == 2.5 and ht['Width'] == 14 and ht['Height'] == 14
       else
-        false
+        ht['X'] == 0 and ht['Y'] == 0 and ht['Width'] == 19 and ht['Height'] == 19
       end
     end
 

data/lib/briar/text_view.rb

@@ -2,19 +2,44 @@ require "calabash-cucumber"
 
 module Briar
   module TextView
-    def text_view_exists? (name)
-      !query("textView marked:'#{name}'").empty?
+    def text_view_exists? (view_id)
+      !query("textView marked:'#{view_id}'").empty?
     end
 
-    def should_see_text_view (name)
-      unless text_view_exists? name
-        screenshot_and_raise "i do not see text view with id #{name}"
+    def wait_for_text_view(view_id, timeout=BRIAR_WAIT_TIMEOUT)
+      msg = "waited for '#{timeout}' seconds but did not see '#{view_id}'"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg) do
+        text_view_exists? view_id
       end
     end
 
-    def should_not_see_text_view (name)
-      if text_view_exists? name
-        screenshot_and_raise "i should not see text view with name #{name}"
+    def wait_for_text_view_to_disappear(view_id, timeout=BRIAR_WAIT_TIMEOUT)
+      msg = "waited for '#{timeout}' seconds for '#{view_id}' to disappear but it is still visible"
+      options = {:timeout => timeout,
+                 :retry_frequency => 0.2,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg}
+      wait_for(options) do
+        not text_view_exists? view_id
+      end
+    end
+
+    def should_see_text_view (view_id, timeout=BRIAR_WAIT_TIMEOUT)
+      wait_for_text_view(view_id, timeout)
+    end
+
+    def should_not_see_text_view (view_id, timeout=BRIAR_WAIT_TIMEOUT)
+      wait_for_text_view_to_disappear(view_id, timeout)
+    end
+
+    def should_see_text_view_with_text(view_id, text)
+      should_see_text_view view_id
+      actual = query("textView marked:'#{view_id}'", :text).first
+      unless @text_entered_by_keyboard.eql?(actual)
+        screenshot_and_raise "i expected to see '#{@text_entered_by_keyboard}' in text view '#{view_id}' but found '#{actual}'"
       end
     end
   end