briar 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmNiZGVhYTAwYTllYWE2NGU1Njg2MmY2NThhN2MyOGE2MTRlMjk0Zg==
+    NzIwYTIwOTk1NzRkOGIwYjljZTZiZWM4YTY4YTg3ZjNiNmUxZjNmMA==
   data.tar.gz: !binary |-
-    M2U0ZWJkNDBmZjljNzJiZTM3ZmY3ZWVjZTViNGY0NDdhY2VmMmI1YQ==
+    YzBjM2M5M2RmMDlmZWQwNDFiYWJhZTk1MWJkNjk5NDU3NjY5ZmE5Zg==
 SHA512:
   metadata.gz: !binary |-
-    NThkZDk3YjUxNDI1MGE4NWRiZDdlMWVkZjcwYzcyMGE3NDU1MTY2ZmI4Yzcz
-    MjM1Njk0NDMzZDY2YmVhYWIwNjdjZTM3MjRlMWFkMzZmM2FlYmZjOTRmMTFi
-    MTYwYWM4MmE3Y2Q4ZGViMDI4OGYxMTNlZjYwN2ZlMWE4M2MwMTI=
+    OTFmOWY1M2JkODY1YmRhMjEzYjBkMWU5N2ZiNzFkNDE3OWM1OGE4NTljM2Zj
+    MDQwNzNhYjJiNzMzMDg2YmIxYTE1OGVmMGMwODc3Y2NkZWJkY2UwZjE3ZGM4
+    MzQxMGJmZjMyYTUwZjEwNTgzNjYzZDRlMDg1YWJlZDI4YWUzNzE=
   data.tar.gz: !binary |-
-    Mjc5MjIyYzQwY2ZkZGMyZjU3NGQyNDIwM2EwZGY2MzMxMmJhZmYzYTAzMDJk
-    ZWM0NDlmOTg0NmU5NmFlN2ViNjRkYjRiZWNhYzlmOGIwM2FmN2UxMDM5YjRi
-    Y2E0OGY3ZWRhMDBjYzliZWYxM2Y0YTE1OTQ0MTc2ZjYyYTBiZDM=
+    MTBhYjhmYTAyZTQxM2IxMmUwNmUzOTVlMzQ2ZmJjYmY0NjhlMzk4NmNhNjBl
+    NjM4M2RlNzc0ZTRhNTgyM2Y4YTIwZGFjODBmYTM1MWFjMzQ0YzNlNjMzOGIw
+    MjllNjgxMjExZTM3NDc2ZDEwYTk3ZWZhNDJhN2Y4NTBhOGRkYTY=

data/briar.gemspec

@@ -15,13 +15,8 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_runtime_dependency 'calabash-cucumber'
-  #gem.add_runtime_dependency 'calabash-cucumber', '0.9.159'
   gem.add_runtime_dependency 'rake'
   gem.add_runtime_dependency 'syntax' 
-  gem.add_runtime_dependency 'rspec'
-
-  # rubymine is not picking up development dependencies in the gemspec
-  #gem.add_development_dependency 'rspec'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = 'briar'

data/features/step_definitions/alerts_and_sheets/action_sheet_steps.rb

@@ -2,8 +2,8 @@ Then /^I touch the "([^"]*)" button on the action sheet$/ do |button_title|
   timeout = 1.0
   msg = "waited for '#{timeout}' seconds but did not see sheet with button '#{button_title}'"
   options = {:timeout => timeout,
-             :retry_frequency => 0.2,
-             :post_timeout => 0.1,
+             :retry_frequency => BRIAR_RETRY_FREQ,
+             :post_timeout => BRIAR_POST_TIMEOUT,
              :timeout_message => msg}
   wait_for(options) do
     not query('actionSheet').empty?

data/features/step_definitions/bars/tabbar_steps.rb

@@ -27,7 +27,7 @@ When /^I touch the "([^"]*)" tab I should see the "([^"]*)" view$/ do |tab_label
 end
 
 Then /^I should see "([^"]*)" tabs$/ do |list_of_tabs|
-  tabs = list_of_tabs.split(/,\s?/)
+  tabs = tokenize_list(list_of_tabs)
   index = 0
   tabs.each do |tab|
     should_see_tab_at_index tab.strip! || tab, index

data/features/step_definitions/control/segmented_control_steps.rb

@@ -3,45 +3,52 @@ Then /^I should see segmented control "([^"]*)" with titles "([^"]*)"$/ do |cont
   should_see_control_with_segment_titles control_id, titles
 end
 
-Then /^I touch segment "([^"]*)" in segmented control "([^"]*)"$/ do |segment_id, control_id|
+Then /^I touch the "([^"]*)" segment in segmented control "([^"]*)"$/ do |segment_id, control_id|
   touch_segment segment_id, control_id
 end
 
-
 Then /^I should see segment "([^"]*)" in segmented control "([^"]*)" (is|is not) selected$/ do |segment_id, control_id, selectedness|
   should_see_segment_with_selected_state control_id, segment_id, selectedness.eql?('is') ? 1 : 0
 end
 
+
+### deprecated - will remove in future versions ####
+
 Then /^I should see the segment I touched (is|is not) selected and the "([^"]*)" should be set correctly$/ do |selectedness, label_id|
-  @associated_label = label_id
-  should_see_segment_with_selected_state @control_id, @segment_id, selectedness.eql?('is') ? 1 : 0
-  # unexpected!
-  # this is a label outside the control that is set by touching the segment
-  # not so good because it conflates segment_id and the title of the segment
-  should_see_label_with_text label_id, @segment_id
+  pending('deprecated 0.1.1 - no replacement')
+  #@associated_label = label_id
+  #should_see_segment_with_selected_state @control_id, @segment_id, selectedness.eql?('is') ? 1 : 0
+  ## unexpected!
+  ## this is a label outside the control that is set by touching the segment
+  ## not so good because it conflates segment_id and the title of the segment
+  #should_see_label_with_text label_id, @segment_id
 end
 
 Then /^I touch the segment again$/ do
-  touch_segment @segment_id, @control_id
+  pending('deprecated 0.1.1 - no replacement')
+  #touch_segment @segment_id, @control_id
 end
 
 Then /^I should see the segment is not selected and the detail label is cleared$/ do
-  # ugh - that @associated_label variable needs to be set
-  macro %Q|I should see segment "#{@segment_id}" in segmented control "#{@control_id}" is not selected|
-  macro %Q|I should see label "#{@associated_label}" with text ""|
+  pending('deprecated 0.1.1 - no replacement')
+  ## ugh - that @associated_label variable needs to be set
+  #macro %Q|I should see segment "#{@segment_id}" in segmented control "#{@control_id}" is not selected|
+  #macro %Q|I should see label "#{@associated_label}" with text ""|
 end
 
 Then /^I should see the segment I touched (is|is not) selected and the "([^"]*)" in the "([^"]*)" row should be set correctly$/ do |selectedness, label_id, row_id|
-  # ugh - that @associated_label variable needs to be set
-  @associated_label = label_id
-  @associated_row = row_id
-  macro %Q|I should see segment "#{@segment_id}" in segmented control "#{@control_id}" #{selectedness} selected|
-  should_see_row_with_label_with_text @associated_row, @associated_label, "#{@segment_id}"
+  pending('deprecated 0.1.1 - no replacement')
+  ## ugh - that @associated_label variable needs to be set
+  #@associated_label = label_id
+  #@associated_row = row_id
+  #macro %Q|I should see segment "#{@segment_id}" in segmented control "#{@control_id}" #{selectedness} selected|
+  #should_see_row_with_label_with_text @associated_row, @associated_label, "#{@segment_id}"
 end
 
 Then /^I should see the segment is not selected and the label in the row is cleared$/ do
-  # ugh - difficult to extract to a function because we need the
-  # @associated_row and @associated_label to be set
-  macro %Q|I should see segment "#{@segment_id}" in segmented control "#{@control_id}" is not selected|
-  should_see_row_with_label_with_text @associated_row, @associated_label, ""
+  pending('deprecated 0.1.1 - no replacement')
+  ## ugh - difficult to extract to a function because we need the
+  ## @associated_row and @associated_label to be set
+  #macro %Q|I should see segment "#{@segment_id}" in segmented control "#{@control_id}" is not selected|
+  #should_see_row_with_label_with_text @associated_row, @associated_label, ""
 end

data/features/step_definitions/email_steps.rb

@@ -8,7 +8,7 @@ Then /^I should see email view with body that contains "([^"]*)"$/ do |text|
   if not device.ios5?
     warn_about_no_ios5_email_view
   else
-    wait_for_animation
+    2.times { step_pause }
     unless email_body_contains? text
       screenshot_and_raise "expected to see email body containing '#{text} but found '#{email_body}'"
     end
@@ -16,20 +16,18 @@ Then /^I should see email view with body that contains "([^"]*)"$/ do |text|
 end
 
 Then /^I touch the "([^"]*)" row and wait to see the email view$/ do |row_id|
+  if email_not_testable?
+    warn_about_no_ios5_email_view
+    return
+  end
+
   if device_can_send_email
-    # cannot do the usual - touch_row_and_wait_to_see because sometimes
-    # we will not see because in iOS 6, email compose views cannot be queried
-    # by calabash
     should_see_row row_id
-    touch("tableViewCell marked:'#{row_id}'")
-    wait_for_animation
-    if not device.ios5?
-      warn_about_no_ios5_email_view
-    else
-      should_see_mail_view
-    end
+    briar_scroll_to_row_and_touch row_id
+    2.times { step_pause }
+    should_see_mail_view
   else
-    pending 'device is not configured for email so a system alert is probably generated, which we cannot touch'
+    pending 'device is not configured for email so a system alert is probably generated'
   end
 end
 
@@ -63,7 +61,7 @@ Then /^I should see email view with text like "([^"]*)" in the subject$/ do |tex
     warn_about_no_ios5_email_view
   else
     should_see_mail_view
-    wait_for_animation
+    2.times { step_pause }
     unless email_subject_has_text_like? text
       screenshot_and_raise "expected to see '#{text}' in the email subject but found '#{email_subject}'"
     end
@@ -71,11 +69,7 @@ Then /^I should see email view with text like "([^"]*)" in the subject$/ do |tex
 end
 
 When /^I cancel email editing I should see the "([^"]*)" view$/ do |view_id|
-  if not device.ios5?
-    delete_draft_and_wait_for view_id
-  else
-    warn_about_no_ios5_email_view
-  end
+  delete_draft_and_wait_for view_id
 end
 
 Given(/^we are testing on the simulator or a device configured to send emails$/) do
@@ -88,3 +82,10 @@ Given(/^we are testing on the simulator or a device configured to send emails$/)
     pending 'device is not configured to send email - we cannot proceed with email view testing'
   end
 end
+
+Given(/^I can test an email view$/) do
+  if (not device.ios5?) and (not uia_available?)
+    warn_about_no_ios5_email_view
+    pending('cannot test email views yet')
+  end
+end

data/features/step_definitions/keyboard_steps.rb

@@ -18,15 +18,17 @@ When /^I touch the done button the keyboard disappears$/ do
   should_not_see_keyboard
 end
 
+
 Then /^I touch the delete key$/ do
   keyboard_enter_char 'Delete'
 end
 
 Then(/^I turn off spell checking and capitalization$/) do
-  should_see_keyboard
-  turn_autocapitalization_off
-  turn_autocorrect_off
-  turn_spell_correct_off
+  pending('deprecated 0.1.1 - not working')
+  #should_see_keyboard
+  #turn_autocapitalization_off
+  #turn_autocorrect_off
+  #turn_spell_correct_off
 end
 
 Then /^I am done text editing$/ do

data/features/step_definitions/table_steps.rb

@@ -77,7 +77,7 @@ Then /^I should see "([^"]*)" in row (\d+)$/ do |row_id, row_index|
 end
 
 Then /^I should see the rows in this order "([^"]*)"$/ do |row_ids|
-  tokens = row_ids.split(',')
+  tokens = tokenize_list(row_ids)
   counter = 0
   tokens.each do |token|
     token.strip!

data/lib/briar.rb

@@ -1,11 +1,19 @@
 #$:.unshift File.dirname(__FILE__)
 
 DEVICE_ENDPOINT = (ENV['DEVICE_ENDPOINT'] || 'http://localhost:37265')
+
+# deprecate these #
 TOUCH_TRANSITION_TIMEOUT = 30.0
 TOUCH_TRANSITION_RETRY_FREQ = 0.5
+##################
+
 BRIAR_STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
 BRIAR_WAIT_TIMEOUT = (ENV['WAIT_TIMEOUT'] || 2.0).to_f
+BRIAR_RETRY_FREQ = (ENV['RETRY_FREQ'] || 0.1).to_f
+BRIAR_POST_TIMEOUT = (ENV['POST_TIMEOUT'] || 0.2).to_f
+
 ANIMATION_PAUSE = (ENV['ANIMATION_PAUSE'] || 0.6).to_f
+
 #noinspection RubyConstantNamingConvention
 AI = :accessibilityIdentifier
 #noinspection RubyConstantNamingConvention
@@ -64,9 +72,12 @@ def device ()
 end
 
 def uia_available?
-  launcher = Calabash::Cucumber::Launcher.launcher
-  return false if launcher.nil?
-  launcher.active?
+  # proxy for testing if run_loop exists
+  if default_device.nil?
+    false
+  else
+    true
+  end
 end
 
 #noinspection RubyDefParenthesesInspection

data/lib/briar/alerts_and_sheets/action_sheet.rb

@@ -36,8 +36,8 @@ module Briar
     def wait_for_sheet (sheet_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see '#{sheet_id}'"
       wait_for(:timeout => timeout,
-               :retry_frequency => 0.2,
-               :post_timeout => 0.1,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg ) do
         sheet_exists? sheet_id
       end
@@ -46,8 +46,8 @@ module Briar
     def wait_for_sheet_to_disappear(sheet_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds for '#{sheet_id}' to disappear but it is still visible"
       options = {:timeout => timeout,
-                 :retry_frequency => 0.2,
-                 :post_timeout => 0.1,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg}
       wait_for(options) do
         not sheet_exists? sheet_id

data/lib/briar/alerts_and_sheets/alert_view.rb

@@ -49,8 +49,8 @@ module Briar
         qstr = 'alertView child label'
         msg = "waited for '#{timeout}' for alert with title '#{title}'"
         wait_for(:timeout => timeout,
-                 :retry_frequency => 0.2,
-                 :post_timeout => 0.1,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg) do
           query(qstr, :text).include?(title)
         end
@@ -68,8 +68,8 @@ module Briar
         qstr = 'alertView child label'
         msg = "waited for '#{timeout}' for alert with message '#{message}'"
         wait_for(:timeout => timeout,
-                 :retry_frequency => 0.2,
-                 :post_timeout => 0.1,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg) do
           query(qstr, :text).include?(title)
         end

data/lib/briar/bars/navbar.rb

@@ -26,8 +26,8 @@ module Briar
       timeout = BRIAR_WAIT_TIMEOUT * 2.0
       msg = "waited for '#{timeout}' seconds but did not see navbar back button"
       wait_for(:timeout => timeout,
-               :retry_frequency => 0.2,
-               :post_timeout => 0.1,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         navbar_has_back_button?
       end
@@ -52,8 +52,8 @@ module Briar
         timeout = BRIAR_WAIT_TIMEOUT
         msg = "waited for '#{timeout}' seconds but did not see '#{name}' in navigation bar"
         wait_for(:timeout => timeout,
-                 :retry_frequency => 0.2,
-                 :post_timeout => 0.1,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg) do
           element_exists qstr
         end
@@ -73,8 +73,8 @@ module Briar
         timeout = 1.0
         msg = "waited for '#{timeout}' seconds but i still see '#{name}' in navigation bar"
         wait_for(:timeout => timeout,
-                 :retry_frequency => 0.2,
-                 :post_timeout => 0.1,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg) do
           element_does_not_exist qstr
         end
@@ -97,7 +97,8 @@ module Briar
     def go_back_after_waiting
       sleep(0.2)
       wait_for(:timeout => 1.0,
-               :retry_frequency => 0.2) do
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT) do
         not query('navigationItemButtonView first').empty?
       end
       touch('navigationItemButtonView first')
@@ -106,8 +107,8 @@ module Briar
 
     def go_back_and_wait_for_view (view)
       sleep(0.2)
-      wait_for(:timeout => 1.0,
-               :retry_frequency => 0.2) do
+      wait_for(:timeout => BRIAR_WAIT_TIMEOUT,
+               :retry_frequency => BRIAR_RETRY_FREQ) do
         not query('navigationItemButtonView first').empty?
       end
 
@@ -119,8 +120,8 @@ module Briar
     end
 
     def touch_navbar_item(item_name, wait_for_view_id=nil)
-      wait_for(:timeout => 1.0,
-               :retry_frequency => 0.4) do
+      wait_for(:timeout => BRIAR_WAIT_TIMEOUT,
+               :retry_frequency => BRIAR_RETRY_FREQ) do
         (index_of_navbar_button(item_name) != nil) || button_exists?(item_name)
       end
       sleep(0.2)
@@ -154,17 +155,12 @@ module Briar
     def should_see_navbar_with_title(title, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but i did not see #{title} in navbar"
       wait_for(:timeout => timeout,
-               :retry_frequency => 0.2,
-               :post_timeout => 0.1,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         navbar_has_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

@@ -25,8 +25,8 @@ module Briar
 
     def touch_tabbar_item(name, wait_for_view_id=nil)
       sleep(0.2)
-      wait_for(:timeout => 1.0,
-               :retry_frequency => 0.4) do
+      wait_for(:timeout => BRIAR_WAIT_TIMEOUT,
+               :retry_frequency => BRIAR_RETRY_FREQ) do
         index_of_tabbar_item(name) != nil
       end
       should_see_tabbar
@@ -49,10 +49,6 @@ module Briar
         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

@@ -94,8 +94,8 @@ module Briar
     def wait_for_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,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         view_exists? view_id
       end
@@ -104,8 +104,8 @@ module Briar
     def wait_for_query(qstr, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see\n '#{qstr}'"
       wait_for(:timeout => timeout,
-               :retry_frequency => 0.2,
-               :post_timeout => 0.1,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         !query(qstr).empty?
       end
@@ -114,8 +114,8 @@ module Briar
     def wait_for_custom_view (view_class, 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,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         !query("view:'#{view_class}' marked:'#{view_id}'").empty?
       end
@@ -137,8 +137,8 @@ module Briar
     def wait_for_views(views, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see '#{views}'"
       options = {:timeout => timeout,
-                 :retry_frequency => 0.2,
-                 :post_timeout => 0.1,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg}
       wait_for(options) do
         views.all? { |view_id| view_exists?(view_id) }
@@ -148,8 +148,8 @@ module Briar
     def wait_for_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,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg}
       wait_for(options) do
         not view_exists? view_id

data/lib/briar/control/button.rb

@@ -54,8 +54,8 @@ module Briar
       def wait_for_button (button_id, timeout=BRIAR_WAIT_TIMEOUT)
         msg = "waited for '#{timeout}' seconds but did not see button '#{button_id}'"
         wait_for(:timeout => timeout,
-                 :retry_frequency => 0.2,
-                 :post_timeout => 0.1,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg ) do
           button_exists? button_id
         end
@@ -64,8 +64,8 @@ module Briar
       def wait_for_button_with_title (button_id, title, timeout=BRIAR_WAIT_TIMEOUT)
         msg = "waited for '#{timeout}' seconds but did not see button '#{button_id}' with title '#{title}'"
         wait_for(:timeout => timeout,
-                 :retry_frequency => 0.2,
-                 :post_timeout => 0.1,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg ) do
           button_exists? button_id
         end

data/lib/briar/control/segmented_control.rb

@@ -16,66 +16,53 @@ module Briar
       end
 
       def index_of_segment_with_name_in_control_with_id(segment_id, control_id)
-        control_idx = index_of_control_with_id (control_id)
-        if control_idx
-          titles = query("segmentedControl index:#{control_idx} child segment child segmentLabel", :text).reverse
-          titles.index(segment_id)
-        else
-          nil
+        qstr = "segmentedControl marked:'#{control_id}'"
+        num_segs = query(qstr, :numberOfSegments).first.to_i
+        idx = 0
+        while idx < num_segs
+          title = query(qstr, {titleForSegmentAtIndex:idx}).first
+          return idx if title.eql?(segment_id)
+          idx = idx + 1
         end
+        return nil
       end
 
       def should_see_segment_with_selected_state (control_id, segment_id, selected_state)
         @segment_id = segment_id
         @control_id = control_id
-        control_idx = index_of_control_with_id control_id
-        if control_idx
-          segment_idx = index_of_segment_with_name_in_control_with_id(segment_id, control_id)
-          if segment_idx
-            selected_arr = query("segmentedControl index:#{control_idx} child segment", :isSelected).reverse
-            res = selected_arr[segment_idx]
-            unless res.to_i == selected_state
-              screenshot_and_raise "found segment named #{segment_id} in  #{control_id}, but it was _not_ selected"
-            end
-          else
-            screenshot_and_raise "could not find #{segment_id} in #{control_id}"
-          end
-        else
-          screenshot_and_raise "could not find control named #{control_id}"
+        res = query("segmentedControl marked:'#{control_id}' child segment marked:'#{segment_id}'",
+                    :isSelected)
+        if res.empty?
+          screenshot_and_raise "expected to see segmented control '#{control_id}' with segment '#{segment_id}'"
+        end
+
+        unless res.first.to_i == selected_state
+          screenshot_and_raise "expected to see segment '#{segment_id}' in '#{control_id}' with selection state '#{selected_state}' but found '#{res.to_i}'"
         end
       end
 
       def touch_segment(segment_id, control_id)
         @segment_id = segment_id
         @control_id = control_id
-        idx = index_of_control_with_id control_id
-        if idx
-          touch("segmentedControl index:#{idx} child segment child segmentLabel marked:'#{segment_id}'")
-          step_pause
-        else
-          screenshot_and_raise "could not find segmented control with name #{control_id}"
-        end
+        touch("segmentedControl marked:'#{control_id}' child segment marked:'#{segment_id}'")
+        step_pause
       end
 
       def should_see_control_with_segment_titles (control_id, segment_titles)
         @control_id = control_id
         should_see_view control_id
-        tokens = segment_titles.split(',')
+        tokens = tokenize_list(segment_titles)
         tokens.each do |token|
           token.strip!
         end
-        idx = index_of_control_with_id control_id
-        if idx
-          actual_titles = query("segmentedControl index:#{idx} child segment child segmentLabel", :text).reverse
-          counter = 0
-          tokens.zip(actual_titles).each do |expected, actual|
-            unless actual.eql? expected
-              screenshot_and_raise "when inspecting #{control_id} i expected title: #{expected} but found: #{actual} at index #{counter}"
-            end
-            counter = counter + 1
+        counter = 0
+        tokens.each do |expected|
+          idx = index_of_segment_with_name_in_control_with_id expected, control_id
+          unless idx == counter
+            actual = query("segmentedControl marked:'#{control_id}'", {titleForSegmentAtIndex:counter}).first
+            screenshot_and_raise "expected to see segment '#{expected}' at index '#{counter}' but found '#{actual}'"
           end
-        else
-          screenshot_and_raise "could not find segmented control with name #{control_id}"
+          counter = counter + 1
         end
       end
     end

data/lib/briar/email.rb

@@ -61,7 +61,7 @@ module Briar
     end
 
     def email_to_contains? (address)
-      addrs = email_to.split(/, ?/)
+      addrs = tokenize_list(email_to)
       addrs.include? address
     end
 
@@ -81,25 +81,32 @@ module Briar
     end
 
     def is_ios6_mail_view
-      warn 'WARN: deprected 0.0.9'
+      warn 'WARN: deprecated 0.0.9'
     end
 
-    def should_see_mail_view (timeout=BRIAR_WAIT_TIMEOUT)
+    def should_see_mail_view (opts = {:timeout => BRIAR_WAIT_TIMEOUT,
+                                      :email_view_mark => 'compose email'})
+
+      {:timeout => BRIAR_WAIT_TIMEOUT, :email_view_mark => 'compose email'}.merge!(opts)
+
+
       if email_not_testable?
         warn_about_no_ios5_email_view
         return
       end
 
+      timeout = opts[:timeout]
       msg = "waited for '#{timeout}' seconds but did not see email compose view"
       dev = device()
+      email_view_mark = opts[:email_view_mark]
       wait_for(:timeout => timeout,
-               :retry_frequency => 0.2,
-               :post_timeout => 0.1,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         if dev.ios5?
           is_ios5_mail_view
         else
-          view_exists? 'compose email'
+          view_exists? email_view_mark
         end
       end
     end
@@ -144,8 +151,8 @@ module Briar
         timeout = BRIAR_WAIT_TIMEOUT * 2
         msg = "waited for '#{timeout}' seconds but did not see cancel button"
         wait_for(:timeout => timeout,
-                 :retry_frequency => 1.1,
-                 :post_timeout => 0.1,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg) do
           uia_element_exists?(:view, marked: 'Cancel')
         end
@@ -153,8 +160,8 @@ module Briar
         uia_tap_mark('Cancel')
         msg = "waited for '#{timeout}' seconds but did not see dismiss email action sheet"
         wait_for(:timeout => timeout,
-                 :retry_frequency => 1.1,
-                 :post_timeout => 0.1,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg) do
           uia_element_exists?(:view, marked: 'Delete Draft')
         end

data/lib/briar/keyboard.rb

@@ -3,8 +3,6 @@ module Briar
     # 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
@@ -14,6 +12,7 @@ module Briar
     UITextAutocorrectionTypeNo = 1
 
 
+    # might be 0 and 1?
     UITextSpellCheckingTypeNo = 1
     UITextSpellCheckingTypeYes = 2
 
@@ -22,8 +21,8 @@ module Briar
     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,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         element_exists('keyboardAutomatic')
       end
@@ -32,8 +31,8 @@ module Briar
     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,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         element_does_not_exist 'keyboardAutomatic'
       end
@@ -68,78 +67,68 @@ module Briar
       end
     end
 
+
+    def briar_clear_text(view_id, timeout=5)
+      warn("deprecated 0.1.1 - will remove 'timeout' argument in a future release")
+      clear_text("view marked:'#{view_id}'")
+
+      # i really wanted this to work, but there are too many issues with the
+      # touch not bringing up the the Select menu bar - for example sometimes
+      # it brings up the typo correction bar.
+      #wait_for_view view_id
+      #step_pause
+      #touch("view marked:'#{view_id}'")
+      #wait_for_button 'Select All', timeout
+      #step_pause
+      #touch_button_and_wait_for_view 'Select All', 'Cut', timeout
+      #step_pause
+      #touch_button 'Cut'
+      #step_pause
+    end
+
+    ### deprecated ###
+
     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}])
-      else
-        screenshot_and_raise 'could not find a text view or text field'
-      end
+      pending('deprecated 0.1.1 - does not work')
+      #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'
+      #end
     end
 
     def turn_autocapitalization_off
-      set_autocapitalization UITextAutocapitalizationTypeNone
+      pending('deprecated 0.1.1 - does not work')
+      #set_autocapitalization UITextAutocapitalizationTypeNone
     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}])
-      else
-        screenshot_and_raise 'could not find a text view or text field'
-      end
+      pending('deprecated 0.1.1 - does not work')
+      #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'
+      #end
     end
 
     def turn_autocorrect_off
-      set_autocorrect UITextAutocorrectionTypeNo
+      pending('deprecated 0.1.1 - does not work')
+      # set_autocorrect UITextAutocorrectionTypeNo
     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}])
-      else
-        screenshot_and_raise 'could not find a text view or text field'
-      end
-    end
-
-    def briar_clear_text(view_id, timeout=5)
-      wait_for_view view_id
-      step_pause
-      touch("view marked:'#{view_id}'")
-      wait_for_button 'Select All', timeout
-      step_pause
-      touch_button_and_wait_for_view 'Select All', 'Cut', timeout
-      step_pause
-      touch_button 'Cut'
-      step_pause
+      pending('deprecated 0.1.1 - does not work')
+      #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'
+      #end
     end
-
-    #def is_capitalize_none (cap_type)
-    #  cap_type == UITextAutocapitalizationTypeNone
-    #end
-    #
-    #def is_capitalize_words (cap_type)
-    #  cap_type == UITextAutocapitalizationTypeWords
-    #end
-    #
-    #def is_capitalize_sentences (cap_type)
-    #  cap_type == UITextAutocapitalizationTypeSentences
-    #end
-    #
-    #def is_capitalize_all (cap_type)
-    #  cap_type == UITextAutocapitalizationTypeAllCharacters
-    #end
-    #
-    #def is_autocorrect_on (state)
-    #  state == UITextAutocorrectionTypeYes
-    #end
-    #
-    #def is_autocorrect_off (state)
-    #  state == UITextAutocorrectionTypeNo
-    #end
   end
 end

data/lib/briar/label.rb

@@ -32,8 +32,8 @@ module Briar
     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,
-               :post_timeout => 0.1,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg ) do
         label_exists? label_id
       end

data/lib/briar/picker/date_picker.rb

@@ -141,7 +141,7 @@ module Briar
         if convert
           past = Time.now.gmtime + Time.now.gmtoff - (target_minutes.to_i * 60)
         else
-          past = Time.new - (60 * target_minutes.to_i)
+          past = Time.now - (60 * target_minutes.to_i)
         end
 
         opts = {:picker_id => picker_id,

data/lib/briar/picker/date_picker_manipulation.rb

@@ -90,7 +90,7 @@ module Briar
 
       def target_date_for_change_time_on_picker_with_time(target_time, convert, picker_id=nil)
         current_time = ruby_time_from_picker picker_id
-        tz_offset = convert ? 0 : (current_time.gmt_offset/3600)/12
+        tz_offset = (convert) ? 0 : Rational((target_time.utc_offset/3600.0)/24.0)
         DateTime.new(current_time.year, current_time.mon, current_time.day,
                      target_time.hour, target_time.min,
                      0, tz_offset)
@@ -117,8 +117,8 @@ module Briar
       def ensure_can_change_picker_to_date(target_dt, picker_id=nil)
         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}'"
+          puts "\ntarget: '#{target_dt}'"
+          puts "   max: '#{max_date}'"
           screenshot_and_raise "cannot change time to '#{target_dt}' because the picker has a maximum date of '#{max_date}'"
         end
 

data/lib/briar/table.rb

@@ -86,8 +86,8 @@ module Briar
       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,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         row_visible? row_id, table_id
       end
@@ -169,19 +169,6 @@ module Briar
       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_visible?(row_id)
-        screenshot_and_raise "i scrolled '#{dir}' but did not see '#{row_id}'"
-      end
-    end
-
-
     def touch_row_offset_hash (row_id, table_id = nil)
       offset = 0
       query = query_str_for_row row_id, table_id
@@ -262,8 +249,8 @@ module Briar
       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,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         element_exists query_str
       end

data/lib/briar/text_view.rb

@@ -9,8 +9,8 @@ module Briar
     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,
+               :retry_frequency => BRIAR_RETRY_FREQ,
+               :post_timeout => BRIAR_POST_TIMEOUT,
                :timeout_message => msg) do
         text_view_exists? view_id
       end
@@ -19,8 +19,8 @@ module Briar
     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,
+                 :retry_frequency => BRIAR_RETRY_FREQ,
+                 :post_timeout => BRIAR_POST_TIMEOUT,
                  :timeout_message => msg}
       wait_for(options) do
         not text_view_exists? view_id

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber
@@ -52,20 +52,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: extends calabash-ios steps
 email:
 - joshuajmoody@gmail.com
@@ -155,10 +141,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
-summary: briar-0.1.0
+summary: briar-0.1.1
 test_files:
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
 - features/step_definitions/alerts_and_sheets/alert_view_steps.rb