briar 0.0.7 → 0.0.8

data/features/step_definitions/keyboard_steps.rb

@@ -10,7 +10,7 @@ end
 Then /^I use the keyboard to enter "([^"]*)"$/ do |text|
   wait_for_animation
   should_see_keyboard
-  @text_entered_by_keyboard = keyboard_enter_text text
+  @text_entered_by_keyboard = briar_keyboard_enter_text text
 end
 
 When /^I touch the done button the keyboard disappears$/ do
@@ -30,5 +30,10 @@ Then(/^I turn off spell checking and capitalization$/) do
 end
 
 Then /^I am done text editing$/ do
-  touch_navbar_item 'done text editing'
+  idx = index_of_navbar_button 'done text editing'
+  if idx
+    touch_navbar_item 'done text editing'
+  else
+    touch_button 'done text editing'
+  end
 end

data/features/step_definitions/picker/date_picker_steps.rb

@@ -1,63 +1,24 @@
-#include Briar::Picker::Date
-
-# steps
 
 Then /^I change the time on the picker to "([^"]*)"$/ do |target_time|
-  screenshot_and_raise 'picker is not in date time or time mode' unless picker_is_in_time_mode or picker_is_in_date_and_time_mode
-  if picker_has_calabash_additions
-    date_str_to_send = date_str_to_send_to_picker_from_time_str target_time
-    set_picker_date_with_date_time_str (date_str_to_send)
-  else
-    screenshot_and_raise 'this version of briar requires a category on UIDatePicker.  Sorry!'
-  end
-
-
-  @date_picker_time_12h = picker_is_in_12h_locale ? picker_time_12h_str : picker_time_for_other_locale
-  @date_picker_time_24h = picker_is_in_24h_locale ? picker_time_24h_str : picker_time_for_other_locale
-
-  # this test catches problems (it is how i caught the scroll down/scroll up
-  # described in the comment block above)
-  unless time_strings_are_equivalent(@date_picker_time_12h, @date_picker_time_24h)
-    screenshot_and_raise "ERROR: changing the picker resulted in two different times: 12H => '#{@date_picker_time_12h}' 24H => '#{@date_picker_time_24h}'"
-  end
-
-  if picker_is_in_date_and_time_mode
-    @date_picker_date_time_12h = picker_is_in_12h_locale ? picker_date_and_time_str_12h : picker_date_and_time_str_for_other_locale
-    @date_picker_date_time_24h = picker_is_in_24h_locale ? picker_date_and_time_str_24h : picker_date_and_time_str_for_other_locale
-    # this test catches problems (it is how i caught the scroll down/scroll up
-    # described in the comment block above)
-    unless date_time_strings_are_equivalent(@date_picker_date_time_12h, @date_picker_date_time_24h)
-      screenshot_and_raise "ERROR: changing the picker resulted in two different dates: 12H => '#{@date_picker_date_time_12h}' 24H => '#{@date_picker_date_time_24h}'"
-    end
-  end
-
-  unless target_time.eql? @date_picker_time_12h or target_time.eql? @date_picker_time_24h
-    screenshot_and_raise "tried to change the time to '#{target_time}' but found '#{@date_picker_time_12h}' or '#{@date_picker_time_24h}'"
-  end
+  change_time_on_picker_with_time_str target_time
 end
 
 Then /^I change the date on the picker to "([^"]*)"$/ do |target_date|
-  if picker_has_calabash_additions
-    date_str_to_send = date_str_to_send_to_picker_from_date_str target_date
-    set_picker_date_with_date_time_str (date_str_to_send)
-  else
-    screenshot_and_raise 'this version of briar requires a category on UIDatePicker.  Sorry!'
-  end
+  change_date_on_picker_with_date_str target_date
 end
 
-
 Then /^I change the picker date to "([^"]*)" and the time to "([^"]*)"$/ do |target_date, target_time|
-  macro %Q|I change the date on the picker to "#{target_date}"|
-  macro %Q|I change the time on the picker to "#{target_time}"|
+  change_time_on_picker_with_time_str target_date
+  change_date_on_picker_with_date_str target_time
 end
 
 Then /^I change the picker to (\d+) days? ago$/ do |days_ago|
   today = Date.today
   #noinspection RubyUnusedLocalVariable
   days_ago = today -= days_ago.to_i
-  fmt = picker_is_in_24h_locale ? PICKER_24H_DATE_FMT : PICKER_12H_DATE_FMT
+  fmt = picker_is_in_24h_locale ? BRIAR_PICKER_24H_BRIEF_DATE_FMT : BRIAR_PICKER_12H_BRIEF_DATE_FMT
   target_date = days_ago.strftime(fmt).squeeze(' ').strip
-  macro %Q|I change the date on the picker to "#{target_date}"|
+  change_date_on_picker_with_date_str target_date
 end
 
 
@@ -65,166 +26,49 @@ Then /^I change the picker to (\d+) days? ago at "([^"]*)"$/ do |days_ago, targe
   today = Date.today
   #noinspection RubyUnusedLocalVariable
   days_ago = today -= days_ago.to_i
-  fmt = picker_is_in_24h_locale ? PICKER_24H_DATE_FMT : PICKER_12H_DATE_FMT
+  fmt = picker_is_in_24h_locale ? BRIAR_PICKER_24H_BRIEF_DATE_FMT : BRIAR_PICKER_12H_BRIEF_DATE_FMT
   target_date = days_ago.strftime(fmt).squeeze(' ').strip
-  macro %Q|I change the picker date to "#{target_date}" and the time to "#{target_time}"|
+  change_date_on_picker_with_date_str target_date
+  change_time_on_picker_with_time_str target_time
 end
 
-# requires that the picker is visible
-Then /^the text in the "([^"]*)" label should match picker date and time$/ do |label_id|
-  text = query("view marked:'#{label_id}'", :text).first
-  screenshot_and_raise "could not find label with id '#{label_id}'"
-  date_time_24h = picker_is_in_24h_locale ? picker_date_and_time_str_24h : picker_date_and_time_str_for_other_locale
-  date_time_12h = picker_is_in_12h_locale ? picker_date_and_time_str_12h : picker_date_and_time_str_for_other_locale
-  unless (text.eql? date_time_12h) or (text.eql? date_time_24h)
-    screenshot_and_raise "expected '#{text}' to match '#{date_time_12h}' or '#{date_time_24h}'"
-  end
-end
 
+#noinspection RubyUnusedLocalVariable
 Then /^I change the picker date time to "([^"]*)"$/ do |target_time|
   pending 'deprecated 0.0.6 - not replaced with anything'
-  date_str = picker_date_str
-  macro %Q|I change the picker date to "#{date_str}" and the time to "#{target_time}"|
 end
 
+
 Then /^I should see that the date picker is in time mode$/ do
-  res = query('datePicker', :datePickerMode).first
-  unless res
-    screenshot_and_raise 'expected to a date picker'
-  end
-  unless res == UIDatePickerModeTime
-    screenshot_and_raise "expected to see picker with time mode but found mode '#{res}'"
+  unless picker_is_in_time_mode
+    screenshot_and_raise 'expected to see picker with time mode'
   end
 end
 
 # requires picker is visible
 Then /^I should see that the time on the picker is now$/ do
-  time_hash =  time_hash_by_add_minutes_until_at_closest_interval (now_time_12h_locale)
-  at_interval_12h = time_hash[:h12]
-  at_interval_24h = time_hash[:h24]
-  picker_time = picker_time_str
-  unless picker_time.eql? at_interval_12h or picker_time.eql? at_interval_24h
-    screenshot_and_raise "expected to picker time to be '#{at_interval_12h}' or '#{at_interval_24h}' but found '#{picker_time}'"
-  end
+  should_see_time_on_picker_is_now
 end
 
 # requires a time or date change.  picker does not need to be visible
 Then /^I should see that the "([^"]*)" row has the time I just entered in the "([^"]*)" label$/ do |row_id, label_id|
-  arr = query("tableViewCell marked:'#{row_id}' isHidden:0 descendant label marked:'#{label_id}'", :text)
-  screenshot_and_raise "could not find '#{label_id}' in the '#{row_id}' row" if arr.empty?
-  actual_text = arr.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
+  should_see_row_has_time_i_just_entered row_id, label_id
 end
 
 # does not require a time or date change. picker needs to be visible
 Then /^I should see that the "([^"]*)" row has the same time as the picker in the "([^"]*)" label$/ do |row_id, label_id|
-  arr = query("tableViewCell marked:'#{row_id}' isHidden:0 descendant label marked:'#{label_id}'", :text)
-  screenshot_and_raise "could not find '#{label_id}' in the '#{row_id}'" if arr.empty?
-  time_str_12h = picker_is_in_12h_locale ? picker_time_12h_str : picker_time_for_other_locale
-  time_str_24h = picker_is_in_24h_locale ? picker_time_24h_str : picker_time_for_other_locale
-  actual_text = arr.first
-  unless (actual_text.eql? time_str_12h) or (actual_text.eql? time_str_24h)
-    screenshot_and_raise "expected to see '#{time_str_12h}' or '#{time_str_24h}' in '#{label_id}' but found '#{actual_text}'"
-  end
-end
-
-# requires a time or date change.  picker does not need to be visible
-Then /^I should see that the "([^"]*)" row has the date and time I just entered in the "([^"]*)" label$/ do |row_id, label_id|
-  arr = query("tableViewCell marked:'#{row_id}' isHidden:0 descendant label marked:'#{label_id}'", :text)
-  screenshot_and_raise "could not find '#{label_id}' in the '#{row_id}' row" if arr.empty?
-  actual_text = arr.first
-  unless (actual_text.eql? @date_picker_date_time_12h) or (actual_text.eql? @date_picker_date_time_24h)
-    screenshot_and_raise "expected to see '#{@date_picker_date_time_12h}' or '#{@date_picker_date_time_24h}' in '#{label_id}' but found '#{actual_text}'"
-  end
+  should_see_row_has_label_with_time_on_picker row_id, label_id
 end
 
 Then /^I change the minute interval on the picker to (1|5|10|30) minutes?$/ do |target_interval|
-  res = query('datePicker', [{setMinuteInterval:target_interval.to_i}])
-  screenshot_and_raise 'did not find a date picker - could not set the minute interval' if res.empty?
-  sleep(PICKER_STEP_PAUSE * 5)
-  @picker_minute_interval = target_interval.to_i
+  change_minute_interval_on_picker target_interval.to_i
 end
 
-Then /^I change the time on the picker to (\d+) minutes? from now$/ do |target_minute|
-  future = Time.new + (60 * target_minute.to_i)
-  time_str = future.strftime(PICKER_12H_TIME_FMT).squeeze(' ').strip
-  macro %Q|I change the time on the picker to "#{time_str}"|
-  sleep(PICKER_STEP_PAUSE)
+Then /^I change the time on the picker to (\d+) minutes? from now$/ do |target_minutes|
+  change_time_on_picker_to_minutes_from_now (target_minutes)
 end
 
-Then /^I change the time on the picker to (\d+) minutes? before now$/ do |target_minute|
-  past = Time.new - (60 * target_minute.to_i)
-  time_str = past.strftime(PICKER_12H_TIME_FMT).squeeze(' ').strip
-  macro %Q|I change the time on the picker to "#{time_str}"|
-  sleep(PICKER_STEP_PAUSE)
+Then /^I change the time on the picker to (\d+) minutes? before now$/ do |target_minutes|
+  change_time_on_picker_to_minutes_before_now (target_minutes)
 end
 
-# DEAD SEA
-
-# old non_category date picking
-#tokens = target_time.split(/[: ]/)
-#screenshot_and_raise "could not parse '#{target_time}' into a valid time" if tokens.count > 3 or tokens.count < 1
-#time_in_24h_locale = tokens.count == 2
-#hour_token = tokens[0].to_i
-#period_token = tokens[2]
-#if time_in_24h_locale
-#  screenshot_and_raise "'#{hour_token}' is not on (0, 23)" unless (0..23).member?(hour_token)
-#  period_token = hour_token > 11 ? PICKER_PM : PICKER_AM
-#else
-#  screenshot_and_raise "'#{hour_token}' is not on (1, 12)" unless (0..12).member?(hour_token)
-#  am_pm_token = tokens[2]
-#  screenshot_and_raise "'#{am_pm_token}' is not a recognized period (AM or PM)" unless (am_pm_token.eql? PICKER_AM or am_pm_token.eql? PICKER_PM)
-#  hour_token = 0 if hour_token == 12 and am_pm_token.eql? PICKER_AM
-#  hour_token = hour_token + 12 if hour_token < 12 and am_pm_token.eql? PICKER_PM
-#end
-#
-#minute_token = tokens[1].to_i
-#screenshot_and_raise "'#{minute_token}'is not on (0, 59)" unless (0..59).member?(minute_token)
-#
-## rollback the date by 1 to avoid maxi date problems
-## decided this was not a good idea because sometimes the rollback step below
-## would not fire
-## picker_scroll_down_on_column 0 if picker_is_in_date_and_time_mode
-#
-#picker_scroll_to_hour hour_token
-#picker_scroll_to_minute minute_token
-#
-#picker_scroll_to_period period_token if picker_is_in_12h_locale
-#
-## rollback the change we made above
-## decided this was not a good idea
-## sometimes this does not fire so you can end up with inconsistent dates
-## see the test below
-## picker_scroll_up_on_column 0 if picker_is_in_date_and_time_mode
-
-
-##
-
-#unless picker_weekday_month_day_is(target_date)
-#  # figure out which way to turn the picker
-#  # target = Date.parse(target_date)
-#  dir = (Date.parse(target_date) < Date.today) ? 'down' : 'up'
-#  limit = 60
-#  count = 0
-#  begin
-#    dir.eql?('down') ? picker_scroll_down_on_column(0) : picker_scroll_up_on_column(0)
-#    sleep(PICKER_STEP_PAUSE)
-#    count = count + 1
-#  end while ((not picker_weekday_month_day_is(target_date)) and count < limit)
-#end
-#unless picker_weekday_month_day_is(target_date)
-#  screenshot_and_raise "scrolled '#{limit}' and could not change date to #{target_date}"
-#end
-#
-#@date_picker_date_time_12h = picker_is_in_12h_locale ? picker_date_and_time_str_12h : picker_date_and_time_str_for_other_locale
-#@date_picker_date_time_24h = picker_is_in_24h_locale ? picker_date_and_time_str_24h : picker_date_and_time_str_for_other_locale
-#if picker_is_in_date_and_time_mode
-#  @date_picker_time_12h = picker_is_in_12h_locale ? picker_time_12h_str : picker_time_for_other_locale
-#  @date_picker_time_24h = picker_is_in_24h_locale ? picker_time_24h_str : picker_time_for_other_locale
-#  unless time_strings_are_equivalent(@date_picker_time_12h, @date_picker_time_24h)
-#    screenshot_and_raise "ERROR: changing the picker resulted in two different times: 12H => '#{@date_picker_time_12h}' 24H => '#{@date_picker_time_24h}'"
-#  end
-#end
-#end

data/features/step_definitions/table_steps.rb

@@ -1,40 +1,39 @@
-#include Briar::Table
-#include Briar::Core
-
 Then /^I should see (?:the|an?) "([^"]*)" row$/ do |name|
   should_see_row name
 end
 
+
+Then(/^I scroll to the "([^"]*)" row$/) do |row_id|
+  briar_scroll_to_row row_id
+end
+
 #noinspection RubyUnusedLocalVariable
-Then /^I scroll (left|right|up|down) until I see the "([^\"]*)" row limit (\d+)$/ do |dir, row_name, limit|
-  pending "deprecated 0.0.6 - use 'Then I scroll #{dir} until I see (?:the|an?) \"#{row_name}\" row"
+Then /^I scroll (left|right|up|down) until I see the "([^\"]*)" row limit (\d+)$/ do |dir, row_id, limit|
+  pending "deprecated 0.0.6 - use 'Then I scroll to the \"#{row_id}\" row'"
 end
 
 
+#noinspection RubyUnusedLocalVariable
 Then /^I scroll (left|right|up|down) until I see (?:the|an?) "([^\"]*)" row$/ do |dir, row_id|
-  scroll_until_i_see_row dir, row_id
+  pending "deprecated 0.0.8 - use 'Then I scroll to the \"#{row_id}\" row'"
 end
 
 Then /^I touch (?:the) "([^"]*)" row and wait for (?:the) "([^"]*)" view to appear$/ do |row_id, view_id|
-  # problem
-  wait_for_animation
+  wait_for_row row_id
   touch_row_and_wait_to_see row_id, view_id
 end
 
 Then /^I touch the "([^"]*)" row on the "([^"]*)" table and wait for the "([^"]*)" view to appear$/ do |row_id, table_id, view_id|
-  wait_for_animation
+  wait_for_row row_id
   touch_row_and_wait_to_see row_id, view_id, table_id
 end
 
-
 Then /^I touch (?:the) "([^"]*)" row$/ do |row_name|
   touch_row row_name
 end
 
-
-Then /^I touch the "([^"]*)" section header$/ do |header_name|
-  touch("tableView child view marked:'#{header_name}'")
-  wait_for_animation
+Then /^I touch the "([^"]*)" section header$/ do |header_id|
+  touch_section_header header_id
 end
 
 Then /^I should see the "([^"]*)" table in edit mode$/ do |table_id|
@@ -46,45 +45,34 @@ end
 
 Then /^the (first|second) row should be "([^"]*)"$/ do |idx, row_id|
   (idx.eql? 'first') ? index = 0 : index = 1
-  res = query('tableViewCell', :accessibilityIdentifier)[index]
-  unless res.eql? row_id
-    screenshot_and_raise "i expected the #{idx} row would be #{row_id}, but found #{res}"
-  end
+  should_see_row_at_index row_id, index
 end
 
+Then(/^the (\d+)(?:st|nd|rd|th)? row should be "([^"]*)"$/) do |row_index, row_id|
+  idx = row_index.to_i - 1
+  should_see_row_at_index row_id, idx
+end
 
 Then /^I swipe (left|right) on the "([^"]*)" row$/ do |dir, row_name|
   swipe_on_row dir, row_name
 end
 
-
-Then /^I should be able to swipe to delete the "([^"]*)" row$/ do |row_name|
-  swipe_on_row 'left', row_name
-  should_see_delete_confirmation_in_row row_name
-  touch_delete_confirmation row_name
-  should_not_see_row row_name
+Then /^I should be able to swipe to delete the "([^"]*)" row$/ do |row_id|
+  swipe_to_delete_row row_id
 end
 
-Then /^I touch the delete button on the "([^"]*)" row$/ do |row_name|
-  should_see_edit_mode_delete_button row_name
-  touch("tableViewCell marked:'#{row_name}' child tableViewCellEditControl")
-  step_pause
-  should_see_delete_confirmation_in_row row_name
+Then /^I touch the delete button on the "([^"]*)" row$/ do |row_id|
+  touch_edit_mode_delete_button row_id
 end
 
-Then /^I use the edit mode delete button to delete the "([^"]*)" row$/ do |row_name|
-  macro %Q|I touch the delete button on the "#{row_name}" row|
-  touch_delete_confirmation row_name
-  should_not_see_row row_name
+Then /^I use the edit mode delete button to delete the "([^"]*)" row$/ do |row_id|
+  delete_row_with_edit_mode_delete_button row_id
 end
 
-Then /^I should see "([^"]*)" in row (\d+)$/ do |cell_name, row|
+Then /^I should see "([^"]*)" in row (\d+)$/ do |row_id, row_index|
   # on ios 6 this is returning nil
-  #res = query("tableViewCell index:#{row}", :accessibilityIdentifier).first
-  access_ids = query('tableViewCell', :accessibilityIdentifier)
-  unless access_ids.index(cell_name) == row.to_i
-    screenshot_and_raise "expected to see '#{cell_name}' in row #{row} but found '#{access_ids[row.to_i]}'"
-  end
+  #res = query("tableViewCell index:#{row}", AI).first
+  should_see_row_at_index row_id, row_index
 end
 
 Then /^I should see the rows in this order "([^"]*)"$/ do |row_ids|
@@ -92,7 +80,7 @@ Then /^I should see the rows in this order "([^"]*)"$/ do |row_ids|
   counter = 0
   tokens.each do |token|
     token.strip!
-    macro %Q|I should see "#{token}" in row #{counter}|
+    should_see_row_at_index token, counter
     counter = counter + 1
   end
 end
@@ -125,7 +113,7 @@ end
 
 Then /^I should see a "([^"]*)" button in the "([^"]*)" row$/ do |button_id, row_id|
   should_see_row row_id
-  arr = query("tableViewCell marked:'#{row_id}' child tableViewCellContentView child button marked:'#{button_id}'", :accessibilityIdentifier)
+  arr = query("tableViewCell marked:'#{row_id}' descendant child tableViewCellContentView child button marked:'#{button_id}'", AI)
   (arr.length == 1)
 end
 
@@ -135,30 +123,15 @@ Then /^I touch the "([^"]*)" button in the "([^"]*)" row$/ do |button_id, row_id
 end
 
 Then /^I should see a switch for "([^"]*)" in the "([^"]*)" row that is in the "([^"]*)" position$/ do |switch_id, row_id, on_off|
-  should_see_row row_id
-  query_str = "tableViewCell marked:'#{row_id}' child tableViewCellContentView child switch marked:'#{switch_id}'"
-  res = query(query_str, :isOn).first
-  unless res
-    screenshot_and_raise "expected to find a switch marked '#{switch_id}' in row '#{row_id}'"
-  end
-  expected = (on_off.eql? 'on') ? 1 : 0
-  unless res.to_i == expected
-    screenshot_and_raise "expected to find a switch marked '#{switch_id}' in row '#{row_id}' that is '#{on_off}' but found it was '#{res ? 'on' : 'off'}'"
-  end
+  should_see_switch_in_row_with_state switch_id, row_id, (on_off.eql? 'on') ? 1 : 0
 end
 
 Then /^I should see a detail disclosure chevron in the "([^"]*)" row$/ do |row_id|
-  should_see_row row_id
-  # gray disclosure chevron is accessory type 1
-  res = query("tableViewCell marked:'#{row_id}'", :accessoryType).first
-  unless res == 1
-    screenshot_and_raise "expected to see disclosure chevron in row '#{row_id}' but found '#{res}'"
-  end
+  should_see_disclosure_chevron_in_row row_id
 end
 
 Then /^I touch the "([^"]*)" switch in the "([^"]*)" row$/ do |switch_id, row_id|
-  should_see_row row_id
-  touch("tableViewCell marked:'#{row_id}' child tableViewCellContentView child switch marked:'#{switch_id}'")
+  touch_switch_in_row switch_id, row_id
 end
 
 Then /^I should see "([^"]*)" in the "([^"]*)" section (footer|header)$/ do |text, section_footer_id, head_or_foot|
@@ -169,23 +142,14 @@ Then /^I should see "([^"]*)" in the "([^"]*)" section (footer|header)$/ do |tex
 end
 
 Then /^I should see a text field with text "([^"]*)" in the "([^"]*)" row$/ do |text, row_id|
-  should_see_row row_id
-  query_str = "tableViewCell marked:'#{row_id}' child tableViewCellContentView child textField"
-  res = query(query_str)
-  screenshot_and_raise "expected to see text field in '#{row_id}' row" if res.empty?
-  actual = query(query_str, :text).first
-  screenshot_and_raise "expected to find text field with '#{text}' in row '#{row_id}' but found '#{actual}'" if !text.eql? actual
+  should_see_text_field_in_row_with_text row_id, text
 end
 
 When /^I touch the "([^"]*)" text field in the "([^"]*)" row the keyboard appears$/ do |text_field_id, row_id|
-  should_see_row row_id
-  query_str = "tableViewCell marked:'#{row_id}' child tableViewCellContentView child textField marked:'#{text_field_id}'"
-  touch(query_str)
-  wait_for_animation
-  should_see_keyboard
+  touch_text_field_in_row_and_wait_for_keyboard text_field_id, row_id
 end
 
-
 Then /^I should see that the "([^"]*)" row has image "([^"]*)"$/ do |row_id, image_id|
   should_see_row_with_image row_id, image_id
 end
+