briar 0.0.5 → 0.0.6

data/lib/briar/alerts_and_sheets/alert_view.rb

@@ -2,8 +2,24 @@ require 'calabash-cucumber'
 
 module Briar
   module Alerts_and_Sheets
+    def alert_exists? (alert_id)
+      !query("alertView marked:'#{alert_id}'").empty?
+    end
+
+    def should_see_alert (alert_id)
+      unless alert_exists? alert_id
+        screenshot_and_raise "should see alert view marked '#{alert_id}'"
+      end
+    end
+
+    def should_not_see_alert (alert_id)
+      if alert_exists? alert_id
+        screenshot_and_raise "should not see alert view marked '#{alert_id}'"
+      end
+    end
+
     def alert_button_exists? (button_id)
-      query("alertView child button child label", :text).include?(button_id)
+      query('alertView child button child label', :text).include?(button_id)
     end
 
     def should_see_alert_button (button_id)

data/lib/briar/bars/navbar.rb

@@ -7,25 +7,25 @@ module Briar
     end
 
     def navbar_has_back_button?
-      !query("navigationItemButtonView").empty?
+          !query('navigationItemButtonView').empty?
     end
 
     def should_see_navbar_back_button
       unless navbar_has_back_button?
-        screenshot_and_raise "there is no navigation bar back button"
+        screenshot_and_raise 'there is no navigation bar back button'
       end
     end
 
     def should_not_see_navbar_back_button
       if navbar_has_back_button?
-        screenshot_and_raise "i should not see navigation bar back button"
+        screenshot_and_raise 'i should not see navigation bar back button'
       end
     end
 
 
     # will not work to detect left/right buttons
     def index_of_navbar_button (name)
-      titles = query("navigationButton", :accessibilityLabel)
+      titles = query('navigationButton', :accessibilityLabel)
       titles.index(name)
     end
 
@@ -44,22 +44,22 @@ module Briar
     end
 
     def date_is_in_navbar (date)
-      with_leading = date.strftime("%a %b %d")
+      with_leading = date.strftime('%a %b %d')
       without_leading = date.strftime("%a %b #{date.day}")
-      items = query("navigationItemView", :accessibilityLabel)
+      items = query('navigationItemView', :accessibilityLabel)
       items.include?(with_leading) || items.include?(without_leading)
     end
 
 
     def go_back_after_waiting
       wait_for_animation
-      touch("navigationItemButtonView first")
+      touch('navigationItemButtonView first')
       step_pause
     end
 
     def go_back_and_wait_for_view (view)
       wait_for_animation
-      touch_transition("navigationItemButtonView first",
+      touch_transition('navigationItemButtonView first',
                        "view marked:'#{view}'",
                        {:timeout=>TOUCH_TRANSITION_TIMEOUT,
                         :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
@@ -73,7 +73,7 @@ module Briar
         touch("navigationButton index:#{idx}")
         step_pause
       else
-        screenshot_and_raise "could not find navbar item #{name}"
+        screenshot_and_raise "could not find navbar item '#{name}'"
       end
     end
 
@@ -88,17 +88,21 @@ module Briar
     end
 
 
-    def navbar_has_title (title)
+    def navbar_has_title? (title)
       wait_for_animation
       query('navigationItemView', :accessibilityLabel).include?(title)
     end
 
-    def navbar_should_have_title(title)
-      unless navbar_has_title title
+    def should_see_navbar_with_title(title)
+      unless navbar_has_title? title
         screenshot_and_raise "after waiting, i did not see navbar with title #{title}"
       end
     end
 
+
+    def navbar_should_have_title(title)
+      pending "deprecated 0.0.6 - use should_see_navbar_with_title '#{title}'"
+    end
   end
 end
 

data/lib/briar/bars/tabbar.rb

@@ -3,12 +3,18 @@ require 'calabash-cucumber'
 module Briar
   module Bars
     def tabbar_visible?
-      element_exists("tabBar")
+      element_exists('tabBar')
     end
 
     def should_see_tabbar
       unless tabbar_visible?
-        screenshot_and_raise "i do not see the tabbar"
+        screenshot_and_raise 'i should see the tabbar'
+      end
+    end
+
+    def should_not_see_tabbar
+      if tabbar_visible?
+        screenshot_and_raise 'i should not see the tabbar'
       end
     end
 
@@ -29,9 +35,15 @@ module Briar
       end
     end
 
-    def tabbar_item_is_at_index(name, index)
+    def should_see_tab_at_index(name, index)
       tabs = query('tabBarButton', :accessibilityLabel)
-      tabs.index(name) == index.to_i
+      unless tabs.index(name) == index.to_i
+        screenshot_and_raise "should have seen tab named '#{name}' at index '#{index}' but found these: '#{tabs}'"
+      end
+    end
+
+    def tabbar_item_is_at_index(name, index)
+      pending "deprecated 0.0.6 - use should_see_tab_at_index '#{name}', '#{index}'"
     end
   end
 end

data/lib/briar/briar_core.rb

@@ -20,7 +20,13 @@ module Briar
 
     def should_see_view (view_id)
       unless view_exists? view_id
-        screenshot_and_raise "no view found with id #{view_id}"
+        screenshot_and_raise "should see view with id '#{view_id}'"
+      end
+    end
+
+    def should_not_see_view (view_id)
+      if view_exists? view_id
+        screenshot_and_raise "should not see view with id '#{view_id}'"
       end
     end
 
@@ -37,14 +43,14 @@ module Briar
     def should_not_see_view_after_animation (view_id)
       wait_for_animation
       if view_exists? view_id
-        screenshot_and_raise "did not expect to see view '#{view_id}'"
+        screenshot_and_raise "should not see view with id '#{view_id}'"
       end
     end
 
     def should_see_view_with_text (text)
       res = view_exists_with_text? text
       unless res
-        screenshot_and_raise "No view found with text #{text}"
+        screenshot_and_raise "should see view with text '#{text}'"
       end
     end
 

data/lib/briar/briar_steps.rb

@@ -1,26 +1,27 @@
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', "briar_core_steps")
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'briar_core_steps')
 
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"alerts_and_sheets", "action_sheet_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"alerts_and_sheets", "alert_view_steps")
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'alerts_and_sheets', 'action_sheet_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'alerts_and_sheets', 'alert_view_steps')
 
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"bars", "tabbar_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"bars", "navbar_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"bars", "toolbar_steps")
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'bars', 'tabbar_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'bars', 'navbar_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'bars', 'toolbar_steps')
 
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"control", "button_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"control", "segmented_control_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"control", "slider_steps")
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'control', 'button_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'control', 'segmented_control_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'control', 'slider_steps')
 
 
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"picker", "picker_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"picker", "date_picker_steps")
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'picker', 'picker_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'picker', 'date_picker_steps')
 
 
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"email_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"image_view_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"keyboard_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"label_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"scroll_view_steps")
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'email_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'image_view_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'keyboard_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'label_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'scroll_view_steps')
 
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"table_steps")
-require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions',"text_field_steps")
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'table_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'text_field_steps')
+require File.join(File.dirname(__FILE__), '..', '..','features','step_definitions', 'text_view_steps')

data/lib/briar/control/button.rb

@@ -40,7 +40,6 @@ module Briar
         touch("button marked:'#{name}'")
         step_pause
       end
-
     end
   end
 end

data/lib/briar/cucumber.rb

@@ -19,6 +19,8 @@ World(Briar::Table)
 World(Briar::TextField)
 World(Briar::TextView)
 
+
+
 AfterConfiguration do
   require 'briar/briar_steps'
 end

data/lib/briar/email.rb

@@ -2,56 +2,71 @@ require 'calabash-cucumber'
 
 module Briar
   module Email
-    def email_body_first_line_is? (text)
+
+    def email_body
+      query("view:'MFComposeTextContentView'", :text)
+    end
+
+    def email_body_contains? (text)
       if gestalt.is_ios6?
-        puts "WARN:  cannot test for email body text on iOS 6 - see https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion"
+        puts 'WARN:  cannot test for email body text on iOS 6 - see https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
       else
-        actual_tokens = query("view:'MFComposeTextContentView'", :text).first.split("\n")
-        actual_tokens.include?(text)
+        !query("view:'MFComposeTextContentView' {text LIKE '*#{text}*'}").empty?
       end
     end
 
+    def email_subject
+      query("view:'MFComposeSubjectView'", :text).first
+    end
+
     def email_subject_is? (text)
       if gestalt.is_ios6?
-        puts "WARN:  cannot test for email subject text on iOS 6 - see https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion"
+        puts 'WARN:  cannot test for email subject text on iOS 6 - see https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
       else
-        actual = query("view marked:'subjectField'", :text)
-        actual.length == 1 && actual.first.eql?(text)
+        email_subject.eql? text
       end
     end
 
     def email_subject_has_text_like? (text)
       if gestalt.is_ios6?
-        puts "WARN:  cannot test for email subject text on iOS 6 - see https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion"
+        puts 'WARN:  cannot test for email subject text on iOS 6 - see https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
       else
-        !query("view marked:'subjectField' {text LIKE '*#{text}*'}").empty?
+        !query("view:'MFComposeSubjectView' {text LIKE '*#{text}*'}").empty?
       end
     end
 
+    def email_to
+      query("view:'_MFMailRecipientTextField'", :text).first
+    end
+
     def email_to_field_is? (text)
       if gestalt.is_ios6?
         puts "WARN: iOS6 detected - cannot test for email 'to' field on iOS simulator or devices"
       else
-        actual = query("view marked:'toField'", :text)
-        actual.length == 1 && actual.first.eql?(text)
+        email_to.eql? text
       end
     end
 
-    def is_ios5_mail_view ()
-      query("view:'MFMailComposeRecipientView'").count == 3
-      #access_ids = query("view", :accessibilityIdentifier)
-      #access_ids.member?("toField") || access_ids.member?("subjectField")
+    def email_to_contains? (address)
+      addrs = email_to.split(/, ?/)
+      addrs.include? address
+    end
+
+    def is_ios5_mail_view
+      query("layoutContainerView descendant view:'MFMailComposeView'").count == 1
     end
 
-    def is_ios6_mail_view()
-      access_ids = query("view", :accessibilityIdentifier)
-      access_ids.member?("RemoteViewBridge")
+    def is_ios6_mail_view
+      gestalt.is_ios6?
+      # sometimes this is returning false
+      # access_ids = query("view", :accessibilityIdentifier)
+      # access_ids.member?("RemoteViewBridge")
     end
 
     def should_see_mail_view
       wait_for_animation
       unless is_ios5_mail_view || is_ios6_mail_view
-        screenshot_and_raise "expected to see email view"
+        screenshot_and_raise 'expected to see email view'
       end
     end
   end

data/lib/briar/keyboard.rb

@@ -1,4 +1,4 @@
-require "calabash-cucumber"
+require 'calabash-cucumber'
 
 module Briar
   module Keyboard
@@ -15,37 +15,37 @@ module Briar
 
 
     def should_see_keyboard
-      res = element_exists("keyboardAutomatic")
+      res = element_exists('keyboardAutomatic')
       unless res
-        screenshot_and_raise "Expected keyboard to be visible."
+        screenshot_and_raise 'Expected keyboard to be visible.'
       end
     end
 
     def should_not_see_keyboard
-      res = element_exists("keyboardAutomatic")
+      res = element_exists('keyboardAutomatic')
       if res
-        screenshot_and_raise "Expected keyboard to not be visible."
+        screenshot_and_raise 'Expected keyboard to not be visible.'
       end
     end
 
     # is it possible to find what view the keyboard is responding to?
     def autocapitalization_type ()
-      if !query("textView index:0").empty?
-        query("textView index:0", :autocapitalizationType).first.to_i
-      elsif !query("textField index:0").empty?
-        query("textField index:0", :autocapitalizationType).first.to_i
+      if !query('textView index:0').empty?
+        query('textView index:0', :autocapitalizationType).first.to_i
+      elsif !query('textField index:0').empty?
+        query('textField index:0', :autocapitalizationType).first.to_i
       else
-        screenshot_and_raise "could not find a text view or text field"
+        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}])
-      elsif !query("textField index:0").empty?
-        query("textField index:0", [{setAutocapitalizationType:type}])
+      if !query('textView index:0').empty?
+        query('textView index:0', [{setAutocapitalizationType:type}])
+      elsif !query('textField index:0').empty?
+        query('textField index:0', [{setAutocapitalizationType:type}])
       else
-        screenshot_and_raise "could not find a text view or text field"
+        screenshot_and_raise 'could not find a text view or text field'
       end
     end
 
@@ -54,12 +54,12 @@ module Briar
     end
 
     def set_autocorrect (type)
-      if !query("textView index:0").empty?
-        query("textView index:0", [{setAutocorrectionType:type}])
-      elsif !query("textField index:0").empty?
-        query("textField index:0", [{setAutocorrectionType:type}])
+      if !query('textView index:0').empty?
+        query('textView index:0', [{setAutocorrectionType:type}])
+      elsif !query('textField index:0').empty?
+        query('textField index:0', [{setAutocorrectionType:type}])
       else
-        screenshot_and_raise "could not find a text view or text field"
+        screenshot_and_raise 'could not find a text view or text field'
       end
     end
 
@@ -68,12 +68,12 @@ module Briar
     end
 
     def turn_spell_correct_off
-      if !query("textView index:0").empty?
-        query("textView index:0", [{setSpellCheckingType:UITextSpellCheckingTypeNo}])
-      elsif !query("textField index:0").empty?
-        query("textField index:0", [{setSpellCheckingType:UITextSpellCheckingTypeNo}])
+      if !query('textView index:0').empty?
+        query('textView index:0', [{setSpellCheckingType:UITextSpellCheckingTypeNo}])
+      elsif !query('textField index:0').empty?
+        query('textField index:0', [{setSpellCheckingType:UITextSpellCheckingTypeNo}])
       else
-        screenshot_and_raise "could not find a text view or text field"
+        screenshot_and_raise 'could not find a text view or text field'
       end
     end
 

data/lib/briar/picker/date_picker.rb

@@ -1,6 +1,49 @@
 require 'date'
 require 'calabash-cucumber'
 
+# 0.2 is too fast because the picker does not pause at the date long enough for
+# the date to change.  0.3 seems to work, but 0.4 is best i think.
+PICKER_STEP_PAUSE = 0.4.to_f
+PICKER_AM = 'AM'
+PICKER_PM = 'PM'
+
+# most locales and situations prefer _not_ to have leading zeros on hours in 24h
+# see usage below to find out when and if the zeros are stripped
+PICKER_24H_TIME_FMT = '%H:%M'
+PICKER_12H_TIME_FMT = '%l:%M %p'
+PICKER_ISO8601_TIME_FMT = '%H:%M'
+
+PICKER_REMOVE_LEADING_ZERO_REGEX = /\A^0/
+
+# 24h locales - Fri 16 Nov - 24h locales
+PICKER_24H_DATE_FMT = '%a %e %b'
+# common format for US Fri Nov 16
+PICKER_12H_DATE_FMT = '%a %b %e'
+
+# our canonical format for testing if two dates are the same
+PICKER_ISO8601_DATE_FMT = '%Y-%m-%d'
+PICKER_ISO8601_DATE_TIME_FMT = '%Y-%m-%d %H:%M'
+
+# when we are using the date picker category, this is the format of the string
+# we will send to setDateWithString:animated:
+#
+# ex. 2012_11_18_16_45
+PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT_ZONED = '%Y_%m_%d_%H_%M_%z'
+PICKER__OBJC___SET_PICKER_DATE__DATE_AND_TIME_FMT_ZONED = 'yyyy_MM_dd_HH_mm_Z'
+PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT = '%Y_%m_%d_%H_%M'
+PICKER__OBJC___SET_PICKER_DATE__DATE_AND_TIME_FMT = 'yyyy_MM_dd_HH_mm'
+
+
+# iOS 5
+PICKER_VIEW_CLASS_IOS5 = 'datePickerView'
+PICKER_VIEW_CLASS_IOS6 = "view:'_UIDatePickerView'"
+
+UIDatePickerModeTime = 0
+UIDatePickerModeDate = 1
+UIDatePickerModeDateAndTime = 2
+UIDatePickerModeCountDownTimer = 3
+
+
 module Briar
   module Picker
     module Date
@@ -102,39 +145,39 @@ to use the automatic mode, include this category in your CALABASH target
 
 =end
 
-# 0.2 is too fast because the picker does not pause at the date long enough for
-# the date to change.  0.3 seems to work, but 0.4 is best i think.
-      PICKER_STEP_PAUSE = 0.4.to_f
-      PICKER_AM = "AM"
-      PICKER_PM = "PM"
-
-# most locales and situations prefer _not_ to have leading zeros on hours in 24h
-# see usage below to find out when and if the zeros are stripped
-      PICKER_24H_TIME_FMT = '%H:%M'
-      PICKER_12H_TIME_FMT = '%l:%M %p'
-      PICKER_ISO8601_TIME_FMT = '%H:%M'
-
-      PICKER_REMOVE_LEADING_ZERO_REGEX = /\A^0/
-
-# 24h locales - Fri 16 Nov - 24h locales
-      PICKER_24H_DATE_FMT = '%a %e %b'
-# common format for US Fri Nov 16
-      PICKER_12H_DATE_FMT = '%a %b %e'
-
-# our canonical format for testing if two dates are the same
-      PICKER_ISO8601_DATE_FMT = '%Y-%m-%d'
-      PICKER_ISO8601_DATE_TIME_FMT = '%Y-%m-%d %H:%M'
-
-# when we are using the date picker category, this is the format of the string
-# we will send to setDateWithString:animated:
+## 0.2 is too fast because the picker does not pause at the date long enough for
+## the date to change.  0.3 seems to work, but 0.4 is best i think.
+#      PICKER_STEP_PAUSE = 0.4.to_f
+#      PICKER_AM = 'AM'
+#      PICKER_PM = 'PM'
 #
-# ex. 2012_11_18_16_45
-      PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT = '%Y_%m_%d_%H_%M_%z'
-      PICKER__OBJC___SET_PICKER_DATE__DATE_AND_TIME_FMT = 'yyyy_MM_dd_HH_mm_Z'
-
-# iOS 5
-      PICKER_VIEW_CLASS_IOS5 = "datePickerView"
-      PICKER_VIEW_CLASS_IOS6 = "view:'_UIDatePickerView'"
+## most locales and situations prefer _not_ to have leading zeros on hours in 24h
+## see usage below to find out when and if the zeros are stripped
+#      PICKER_24H_TIME_FMT = '%H:%M'
+#      PICKER_12H_TIME_FMT = '%l:%M %p'
+#      PICKER_ISO8601_TIME_FMT = '%H:%M'
+#
+#      PICKER_REMOVE_LEADING_ZERO_REGEX = /\A^0/
+#
+## 24h locales - Fri 16 Nov - 24h locales
+#      PICKER_24H_DATE_FMT = '%a %e %b'
+## common format for US Fri Nov 16
+#      PICKER_12H_DATE_FMT = '%a %b %e'
+#
+## our canonical format for testing if two dates are the same
+#      PICKER_ISO8601_DATE_FMT = '%Y-%m-%d'
+#      PICKER_ISO8601_DATE_TIME_FMT = '%Y-%m-%d %H:%M'
+#
+## when we are using the date picker category, this is the format of the string
+## we will send to setDateWithString:animated:
+##
+## ex. 2012_11_18_16_45
+#      PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT = '%Y_%m_%d_%H_%M_%z'
+#      PICKER__OBJC___SET_PICKER_DATE__DATE_AND_TIME_FMT = 'yyyy_MM_dd_HH_mm_Z'
+#
+## iOS 5
+#      PICKER_VIEW_CLASS_IOS5 = 'datePickerView'
+#      PICKER_VIEW_CLASS_IOS6 = "view:'_UIDatePickerView'"
 
 # testing for existence
       def should_see_date_picker (picker_id)
@@ -147,24 +190,24 @@ to use the automatic mode, include this category in your CALABASH target
 # getting dates from the picker
 
       def picker_date_time
-        res = query("datePicker", :date)
-        screenshot_and_raise "expected to see a date picker" if res.empty?
+        res = query('datePicker', :date)
+        screenshot_and_raise 'expected to see a date picker' if res.empty?
         DateTime.parse(res.first)
       end
 
 # appledoc ==> The property is an NSDate object or nil (the default), which
 # means no maximum date.
       def picker_maximum_date_time
-        res = query("datePicker", :maximumDate)
-        screenshot_and_raise "expected to see a date picker" if res.empty?
+        res = query('datePicker', :maximumDate)
+        screenshot_and_raise 'expected to see a date picker' if res.empty?
         res.first != nil ? DateTime.parse(res.first) : nil
       end
 
 # appledoc ==> The property is an NSDate object or nil (the default), which
 # means no minimum date.
       def picker_minimum_date_time
-        res = query("datePicker", :minimumDate)
-        screenshot_and_raise "expected to see a date picker" if res.empty?
+        res = query('datePicker', :minimumDate)
+        screenshot_and_raise 'expected to see a date picker' if res.empty?
         res.first != nil ? DateTime.parse(res.first) : nil
       end
 
@@ -173,9 +216,9 @@ to use the automatic mode, include this category in your CALABASH target
 # checking to see if the picker is visible and has the calabash category
 # additions
       def picker_has_calabash_additions
-        success_value = "1"
-        res = query("datePicker", [{hasCalabashAdditions:success_value}])
-        screenshot_and_raise "picker is not visible" if res.empty?
+        success_value = '1'
+        res = query('datePicker', [{hasCalabashAdditions:success_value}])
+        screenshot_and_raise 'picker is not visible' if res.empty?
         res.first.eql? success_value
       end
 
@@ -188,40 +231,43 @@ to use the automatic mode, include this category in your CALABASH target
         !date_str[-1, 1].scan(/^[a-zA-Z]/).empty?
       end
 
-      def date_str_to_send_to_picker_from_time_str (time_str)
+      def date_str_to_send_to_picker_from_time_str (time_str, format=PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT)
         time_in_24h = date_time_or_time_str_is_in_24h time_str
         time_fmt = time_in_24h ? PICKER_24H_TIME_FMT : PICKER_12H_TIME_FMT
         date_fmt = time_in_24h ? PICKER_24H_DATE_FMT : PICKER_12H_DATE_FMT
-        date_str = picker_date_time.strftime(date_fmt).squeeze(" ").strip
+        date_str = picker_date_time.strftime(date_fmt).squeeze(' ').strip
 
         date_time_str = "#{date_str} #{time_str}"
         date_time_fmt = "#{date_fmt} #{time_fmt}"
 
         date_time = DateTime.strptime(date_time_str, date_time_fmt)
-        date_time.strftime(PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT).squeeze(" ").strip
+        date_time.strftime(format).squeeze(' ').strip
       end
 
 
-      def date_str_to_send_to_picker_from_date_str (date_str)
+      def date_str_to_send_to_picker_from_date_str (date_str, format=PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT)
         date_in_24h = date_str_is_in_24h (date_str)
         time_fmt = date_in_24h ? PICKER_24H_TIME_FMT : PICKER_12H_TIME_FMT
         date_fmt = date_in_24h ? PICKER_24H_DATE_FMT : PICKER_12H_DATE_FMT
-        time_str = picker_date_time.strftime(time_fmt).squeeze(" ").strip
+        time_str = picker_date_time.strftime(time_fmt).squeeze(' ').strip
         date_time_str = "#{date_str} #{time_str}"
         date_time_fmt = "#{date_fmt} #{time_fmt}"
+
         date_time = DateTime.strptime(date_time_str, date_time_fmt)
-        date_time.strftime(PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT).squeeze(" ").strip
+
+        date_time.strftime(format).squeeze(' ').strip
       end
 
 
-      def set_picker_date_with_date_time_str (date_time_str, animated=1)
-        query("datePicker", [{respondsToSelector:"minuteInterval"}])
+      def set_picker_date_with_date_time_str (date_time_str, opts={:animated => 1,
+                                                                   :objc_format => PICKER__OBJC___SET_PICKER_DATE__DATE_AND_TIME_FMT})
+        query('datePicker', [{respondsToSelector: 'minuteInterval'}])
 
+        res = query('datePicker', [{setDateWithString:date_time_str},
+                                   {format:"#{opts[:objc_format]}"},
+                                   {animated:opts[:animated]}])
 
-        res = query("datePicker", [{setDateWithString:date_time_str},
-                                   {format:"#{PICKER__OBJC___SET_PICKER_DATE__DATE_AND_TIME_FMT}"},
-                                   {animated:animated.to_i}])
-        screenshot_and_raise "could not find a date picker to query" if res.empty?
+        screenshot_and_raise 'could not find a date picker to query' if res.empty?
         if res.first.to_i == 0
           screenshot_and_raise "could not set the picker date with '#{date_time_str}' and '#{PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT}'"
         end
@@ -232,17 +278,19 @@ to use the automatic mode, include this category in your CALABASH target
         # the query does not create a UIControlEventValueChanged event, so we have to
         # to a touch event
 
+        # not true :(
         # if the picker is in time mode, then we dont need to worry about min/max
+
         # if the picker is date or date time mode, i think the first column is
         # always scrollable up _and_ it sends an event even if the date is beyond
         # the maximum date
-
+        #
         #picker_max_date = picker_maximum_date_time
         #picker_min_date = picker_minimum_date_time
         #target_date = DateTime.strptime(date_time_str, PICKER__RUBY___SET_PICKER_DATE__DATE_AND_TIME_FMT)
-
+        #
         #column_one_index = picker_current_index_for_column 0
-        #query("pickerTableView index:0", [{selectRow:column_one_index}, {animated:1}, {notify:1}])
+        #query('pickerTableView index:0', [{selectRow:column_one_index}, {animated:1}, {notify:1}])
 
         picker_scroll_down_on_column 0
         sleep(PICKER_STEP_PAUSE)
@@ -268,10 +316,10 @@ to use the automatic mode, include this category in your CALABASH target
 # if it is not, the default value is used. The default and minimum values are 1;
 # the maximum value is 30.
       def picker_minute_interval
-        screenshot_and_raise "there is no minute in date mode" if picker_is_in_date_mode
-        screenshot_and_raise "nyi" if picker_is_in_countdown_mode
-        res = query("datePicker", :minuteInterval)
-        screenshot_and_raise "expected to see a date picker" if res.empty?
+        screenshot_and_raise 'there is no minute in date mode' if picker_is_in_date_mode
+        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
+        res = query('datePicker', :minuteInterval)
+        screenshot_and_raise 'expected to see a date picker' if res.empty?
         @picker_minute_interval = res.first
       end
 
@@ -290,21 +338,18 @@ to use the automatic mode, include this category in your CALABASH target
         end while ((minute % interval) != 0)
         time = time + (count * 60)
 
-        {:h12 => time.strftime(PICKER_12H_TIME_FMT).squeeze(" ").strip,
-         :h24 => time.strftime(PICKER_24H_TIME_FMT).squeeze(" ").strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX,""),
+        {:h12 => time.strftime(PICKER_12H_TIME_FMT).squeeze(' ').strip,
+         :h24 => time.strftime(PICKER_24H_TIME_FMT).squeeze(' ').strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX, ''),
          :time => time}
       end
 
 # picker modes
 
-      UIDatePickerModeTime = 0
-      UIDatePickerModeDate = 1
-      UIDatePickerModeDateAndTime = 2
-      UIDatePickerModeCountDownTimer = 3
+
 
       def picker_mode
-        res = query("datePicker", :datePickerMode)
-        screenshot_and_raise "expected to see a date picker" if res.empty?
+        res = query('datePicker', :datePickerMode)
+        screenshot_and_raise 'expected to see a date picker' if res.empty?
         res.first
       end
 
@@ -327,27 +372,27 @@ to use the automatic mode, include this category in your CALABASH target
 # columns for different modes
 
       def picker_column_for_hour
-        screenshot_and_raise "there is no hour column in date mode" if picker_is_in_date_mode
-        screenshot_and_raise "nyi" if picker_is_in_countdown_mode
+        screenshot_and_raise 'there is no hour column in date mode' if picker_is_in_date_mode
+        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
         picker_is_in_time_mode ? 0 : 1
       end
 
       def picker_column_for_minute
-        screenshot_and_raise "there is no minute column in date mode" if picker_is_in_date_mode
-        screenshot_and_raise "nyi" if picker_is_in_countdown_mode
+        screenshot_and_raise 'there is no minute column in date mode' if picker_is_in_date_mode
+        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
         picker_is_in_time_mode ? 1 : 2
       end
 
       def picker_column_for_period
-        screenshot_and_raise "there is no period column in date mode" if picker_is_in_date_mode
-        screenshot_and_raise "nyi" if picker_is_in_countdown_mode
+        screenshot_and_raise 'there is no period column in date mode' if picker_is_in_date_mode
+        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
         picker_is_in_time_mode ? 2 : 3
       end
 
 # 12h or 24h locale
 
       def picker_is_in_12h_locale
-        screenshot_and_raise "12h/24h mode is not applicable to this mode" if picker_is_in_date_mode or picker_is_in_countdown_mode
+        screenshot_and_raise '12h/24h mode is not applicable to this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
         column = picker_column_for_period
         !query("pickerTableView index:#{column}").empty?
       end
@@ -362,42 +407,42 @@ to use the automatic mode, include this category in your CALABASH target
 # pt (lisbon) - a.m./p.m.
 # de - nach/vor
       def picker_period
-        screenshot_and_raise "picker is not in 12h mode" if picker_is_in_24h_locale
+        screenshot_and_raise 'picker is not in 12h mode' if picker_is_in_24h_locale
         date = picker_date_time
         date_str = date.strftime(PICKER_12H_TIME_FMT)
-        tokens = date_str.split(" ")
+        tokens = date_str.split(' ')
         tokens.last
       end
 
       def picker_period_is_am?
-        picker_period.eql?("AM")
+        picker_period.eql?('AM')
       end
 
       def picker_period_is_pm?
-        picker_period.eql?("PM")
+        picker_period.eql?('PM')
       end
 
 # weekday, month, day, etc
 
       def picker_weekday
-        screenshot_and_raise "weekday is not applicable to this mode" if picker_is_in_time_mode or picker_is_in_countdown_mode
-        res = query("datePickerWeekMonthDayView", :weekdayLabel, :text)[2]
+        screenshot_and_raise 'weekday is not applicable to this mode' if picker_is_in_time_mode or picker_is_in_countdown_mode
+        res = query('datePickerWeekMonthDayView', :weekdayLabel, :text)[2]
         # need to guard against Today showing
         res == nil ? Date.today.strftime('%a') : res
       end
 
       def picker_month_day
-        screenshot_and_raise "month/day is not applicable to this mode" if picker_is_in_time_mode or picker_is_in_countdown_mode
-        res = query("datePickerWeekMonthDayView", :dateLabel, :text)[2]
-        picker_iso = picker_date_time.strftime(PICKER_ISO8601_DATE_FMT).squeeze(" ").strip
+        screenshot_and_raise 'month/day is not applicable to this mode' if picker_is_in_time_mode or picker_is_in_countdown_mode
+        res = query('datePickerWeekMonthDayView', :dateLabel, :text)[2]
+        picker_iso = picker_date_time.strftime(PICKER_ISO8601_DATE_FMT).squeeze(' ').strip
         today = Date.today
-        today_iso = today.strftime(PICKER_ISO8601_DATE_FMT).squeeze(" ").strip
+        today_iso = today.strftime(PICKER_ISO8601_DATE_FMT).squeeze(' ').strip
         fmt = picker_is_in_24h_locale ? '%e %b' : '%b %e'
         (picker_iso.eql? today_iso) ? today.strftime(fmt) : res
       end
 
       def picker_date_str
-        "#{picker_weekday} #{picker_month_day}".strip.squeeze(" ")
+        "#{picker_weekday} #{picker_month_day}".strip.squeeze(' ')
       end
 
       def picker_weekday_month_day_is (weekday_month_day)
@@ -407,7 +452,7 @@ to use the automatic mode, include this category in your CALABASH target
 # dealing with time
 
       def picker_hour_24h
-        screenshot_and_raise "hour is not applicable to this mode" if picker_is_in_countdown_mode or picker_is_in_date_mode
+        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
         #  query always returns as 24h
         res_ios5 = query(PICKER_VIEW_CLASS_IOS5, :hour).first
         res_ios6 = query(PICKER_VIEW_CLASS_IOS6, :hour).first
@@ -416,19 +461,19 @@ to use the automatic mode, include this category in your CALABASH target
       end
 
       def picker_hour_24h_str
-        screenshot_and_raise "hour is not applicable to this mode" if picker_is_in_countdown_mode or picker_is_in_date_mode
-        "%02d" % picker_hour_24h
+        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
+        '%02d' % picker_hour_24h
       end
 
       def picker_hour_12h
-        screenshot_and_raise "hour is not applicable to this mode" if picker_is_in_countdown_mode or picker_is_in_date_mode
+        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
         hour_24h = picker_hour_24h
         return 12 if hour_24h == 0
         hour_24h > 12 ? hour_24h - 12 : hour_24h
       end
 
       def picker_hour_12h_str
-        screenshot_and_raise "hour is not applicable to this mode" if picker_is_in_countdown_mode or picker_is_in_date_mode
+        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
         "#{picker_hour_12h}"
       end
 
@@ -445,7 +490,7 @@ to use the automatic mode, include this category in your CALABASH target
       end
 
       def picker_minute
-        screenshot_and_raise "hour is not applicable to this mode" if picker_is_in_countdown_mode or picker_is_in_date_mode
+        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
         res_ios5 = query(PICKER_VIEW_CLASS_IOS5, :minute).first
         res_ios6 = query(PICKER_VIEW_CLASS_IOS6, :minute).first
         return res_ios5 != nil ? res_ios5 : res_ios6
@@ -453,8 +498,8 @@ to use the automatic mode, include this category in your CALABASH target
       end
 
       def picker_minute_str
-        screenshot_and_raise "hour is not applicable to this mode" if picker_is_in_countdown_mode or picker_is_in_date_mode
-        "%02d" % picker_minute
+        screenshot_and_raise 'hour is not applicable to this mode' if picker_is_in_countdown_mode or picker_is_in_date_mode
+        '%02d' % picker_minute
         #"%02d" % query("datePickerView", :minute).first
       end
 
@@ -463,35 +508,35 @@ to use the automatic mode, include this category in your CALABASH target
       end
 
       def picker_time_24h_str
-        screenshot_and_raise "the time is not applicable for this mode" if picker_is_in_date_mode or picker_is_in_countdown_mode
-        "#{picker_hour_24h_str}:#{picker_minute_str}".strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX, "")
+        screenshot_and_raise 'the time is not applicable for this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
+        "#{picker_hour_24h_str}:#{picker_minute_str}".strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX, '')
       end
 
       def picker_time_12h_str
-        screenshot_and_raise "the time is not applicable for this mode" if picker_is_in_date_mode or picker_is_in_countdown_mode
+        screenshot_and_raise 'the time is not applicable for this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
         "#{picker_hour_12h_str}:#{picker_minute_str} #{picker_period}"
       end
 
       def picker_time_str
-        screenshot_and_raise "the time is not applicable for this mode" if picker_is_in_date_mode or picker_is_in_countdown_mode
+        screenshot_and_raise 'the time is not applicable for this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
         picker_is_in_24h_locale ? picker_time_24h_str : picker_time_12h_str
       end
 
       def picker_time_for_other_locale
         time_str = picker_is_in_24h_locale ? picker_time_24h_str : picker_time_12h_str
         fmt_str = picker_is_in_24h_locale ? PICKER_12H_TIME_FMT : PICKER_24H_TIME_FMT
-        Time.parse(time_str).strftime(fmt_str).squeeze(" ").strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX,"")
+        Time.parse(time_str).strftime(fmt_str).squeeze(' ').strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX, '')
       end
 
 # date and time
 
       def picker_date_and_time_str_24h
-        screenshot_and_raise "the time is not applicable for this mode" if picker_is_in_date_mode or picker_is_in_countdown_mode
+        screenshot_and_raise 'the time is not applicable for this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
         "#{picker_date_str} #{picker_time_24h_str}"
       end
 
       def picker_date_and_time_str_12h
-        screenshot_and_raise "the time is not applicable for this mode" if picker_is_in_date_mode or picker_is_in_countdown_mode
+        screenshot_and_raise 'the time is not applicable for this mode' if picker_is_in_date_mode or picker_is_in_countdown_mode
         "#{picker_date_str} #{picker_time_12h_str}"
       end
 
@@ -507,8 +552,8 @@ to use the automatic mode, include this category in your CALABASH target
 
       def now_times_map
         now = Time.new
-        {:h12 => now.strftime(PICKER_12H_TIME_FMT).squeeze(" ").strip,
-         :h24 => now.strftime(PICKER_24H_TIME_FMT).squeeze(" ").strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX,""),
+        {:h12 => now.strftime(PICKER_12H_TIME_FMT).squeeze(' ').strip,
+         :h24 => now.strftime(PICKER_24H_TIME_FMT).squeeze(' ').strip.sub(PICKER_REMOVE_LEADING_ZERO_REGEX, ''),
          :time => now}
       end
 
@@ -523,7 +568,7 @@ to use the automatic mode, include this category in your CALABASH target
 # scrolling picker
 
       def picker_scroll_to_hour (target_hour_int_24h_notation)
-        screenshot_and_raise "nyi" if picker_is_in_countdown_mode
+        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
         column = picker_column_for_hour
         limit = 25
         count = 0
@@ -540,7 +585,7 @@ to use the automatic mode, include this category in your CALABASH target
       end
 
       def picker_scroll_to_minute (target_minute_int)
-        screenshot_and_raise "nyi" if picker_is_in_countdown_mode
+        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
         column = picker_column_for_minute
         limit = 61
         count = 0
@@ -557,8 +602,8 @@ to use the automatic mode, include this category in your CALABASH target
       end
 
       def picker_scroll_to_period(target_period_str)
-        screenshot_and_raise "nyi" if picker_is_in_countdown_mode
-        screenshot_and_raise "period is not applicable to 24h locale" if picker_is_in_24h_locale
+        screenshot_and_raise 'nyi' if picker_is_in_countdown_mode
+        screenshot_and_raise 'period is not applicable to 24h locale' if picker_is_in_24h_locale
         column = picker_column_for_period
         limit = 3
         count = 0