briar 0.0.5 → 0.0.6

data/features/step_definitions/keyboard_steps.rb

@@ -1,4 +1,3 @@
-#include Briar::Keyboard
 
 Then /^I should see the keyboard$/ do
   should_see_keyboard
@@ -8,7 +7,6 @@ Then /^I should not see the keyboard$/ do
   should_not_see_keyboard
 end
 
-
 Then /^I use the keyboard to enter "([^"]*)"$/ do |text|
   wait_for_animation
   should_see_keyboard
@@ -19,3 +17,18 @@ When /^I touch the done button the keyboard disappears$/ do
   done
   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
+end
+
+Then /^I am done text editing$/ do
+  touch_navbar_item 'done text editing'
+end

data/features/step_definitions/picker/date_picker_steps.rb

@@ -3,47 +3,15 @@
 # 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
+  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
-    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
+    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
 
@@ -73,31 +41,7 @@ Then /^I change the date on the picker to "([^"]*)"$/ do |target_date|
     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
-    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
+    screenshot_and_raise 'this version of briar requires a category on UIDatePicker.  Sorry!'
   end
 end
 
@@ -109,18 +53,20 @@ 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
-  target_date = days_ago.strftime(fmt).squeeze(" ").strip
+  target_date = days_ago.strftime(fmt).squeeze(' ').strip
   macro %Q|I change the date on the picker to "#{target_date}"|
 end
 
 
 Then /^I change the picker to (\d+) days? ago at "([^"]*)"$/ do |days_ago, target_time|
   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
-  target_date = days_ago.strftime(fmt).squeeze(" ").strip
+  target_date = days_ago.strftime(fmt).squeeze(' ').strip
   macro %Q|I change the picker date to "#{target_date}" and the time to "#{target_time}"|
 end
 
@@ -136,14 +82,15 @@ Then /^the text in the "([^"]*)" label should match picker date and time$/ do |l
 end
 
 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
+  res = query('datePicker', :datePickerMode).first
   unless res
-    screenshot_and_raise "expected to a date picker"
+    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}'"
@@ -194,23 +141,90 @@ Then /^I should see that the "([^"]*)" row has the date and time I just entered
 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?
+  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
 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
+  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)
 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
+  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)
 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/picker/picker_steps.rb

@@ -12,7 +12,7 @@ end
 
 Then /^I scroll (up|down) on picker "([^"]*)"$/ do |dir, picker_name|
   should_see_picker picker_name
-  if dir.eql? "down"
+  if dir.eql? 'down'
     picker_scroll_down_on_column 0
   else
     picker_scroll_up_on_column 0
@@ -26,7 +26,7 @@ Then /^I scroll (up|down) on picker "([^"]*)" to row (\d+)$/ do |dir, picker, ro
   unless picker_current_index_for_column_is(0, target_row)
     count = 0
     begin
-      if dir.eql? "down"
+      if dir.eql? 'down'
         picker_scroll_down_on_column 0
       else
         picker_scroll_up_on_column 0
@@ -49,7 +49,7 @@ Then /^I should see picker "([^"]*)" has selected row (\d+)$/ do |picker, row|
 end
 
 Then /^I should (see|not see) picker "([^"]*)"$/ do |visibility, picker|
-  target = visibility.eql? "see"
+  target = visibility.eql? 'see'
   if target
     should_see_picker picker
   else

data/features/step_definitions/scroll_view_steps.rb

@@ -1,20 +1,21 @@
-#include Briar::ScrollView
-#include Briar::Core
 
-Then /^I scroll (left|right|up|down) until I see "([^\"]*)" limit (\d+)$/ do |dir, name, limit|
-  unless exists?(name)
-    count = 0
-    begin
-      scroll("scrollView index:0", dir)
-      step_pause
-      count = count + 1
-    end while ((not exists?(name)) and count < limit.to_i)
+
+#noinspection RubyUnusedLocalVariable
+Then /^I scroll (left|right|up|down) until I see "([^\"]*)" limit (\d+)$/ do |dir, marker, limit|
+  pending "deprecated 0.0.6 - use Then I scroll #{dir} until I see \"#{marker}\""
+end
+
+Then /^I scroll (left|right|up|down) until I see "([^\"]*)"$/ do |dir, marker|
+  wait_poll({:until_exists => "view marked:'#{marker}'",
+             :timeout => 2}) do
+    scroll('scrollView index:0', dir)
   end
-  unless exists?(name)
-    screenshot_and_raise "i scrolled '#{dir}' '#{limit}' times but did not see #{name}"
+  unless exists? marker
+    screenshot_and_raise "i scrolled '#{dir}' but did not see #{marker}"
   end
 end
 
+
 Then /^I scroll "([^"]*)" (left|right|up|down)"$/ do |name, dir|
   swipe(dir, {:query => "view marked:'#{name}'"})
 end

data/features/step_definitions/table_steps.rb

@@ -5,11 +5,16 @@ Then /^I should see (?:the|an?) "([^"]*)" row$/ do |name|
   should_see_row name
 end
 
+#noinspection RubyUnusedLocalVariable
 Then /^I scroll (left|right|up|down) until I see the "([^\"]*)" row limit (\d+)$/ do |dir, row_name, limit|
-  scroll_until_i_see_row dir, row_name, limit
+  pending "deprecated 0.0.6 - use 'Then I scroll #{dir} until I see (?:the|an?) \"#{row_name}\" row"
 end
 
 
+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
+end
+
 Then /^I touch (?:the) "([^"]*)" row and wait for (?:the) "([^"]*)" view to appear$/ do |row_id, view_id|
   # problem
   wait_for_animation
@@ -40,8 +45,8 @@ end
 
 
 Then /^the (first|second) row should be "([^"]*)"$/ do |idx, row_id|
-  (idx.eql? "first") ? index = 0 : index = 1
-  res = query("tableViewCell", :accessibilityIdentifier)[index]
+  (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
@@ -54,7 +59,7 @@ end
 
 
 Then /^I should be able to swipe to delete the "([^"]*)" row$/ do |row_name|
-  swipe_on_row "left", 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
@@ -76,14 +81,14 @@ end
 Then /^I should see "([^"]*)" in row (\d+)$/ do |cell_name, row|
   # on ios 6 this is returning nil
   #res = query("tableViewCell index:#{row}", :accessibilityIdentifier).first
-  access_ids = query("tableViewCell", :accessibilityIdentifier)
+  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
 end
 
 Then /^I should see the rows in this order "([^"]*)"$/ do |row_ids|
-  tokens = row_ids.split(",")
+  tokens = row_ids.split(',')
   counter = 0
   tokens.each do |token|
     token.strip!
@@ -102,7 +107,7 @@ end
 
 Then /^I move the "([^"]*)" row (up|down) (\d+) times? using the reorder edit control$/ do |row_id, dir, n|
   should_see_row row_id
-  dir_str = (dir.eql?("up")) ? "drag_row_up" : "drag_row_down"
+  dir_str = (dir.eql?('up')) ? 'drag_row_up' : 'drag_row_down'
   n.to_i.times do (
   playback(dir_str,
            {:query => "tableViewCell marked:'#{row_id}' descendant tableViewCellReorderControl"})
@@ -111,7 +116,7 @@ Then /^I move the "([^"]*)" row (up|down) (\d+) times? using the reorder edit co
 end
 
 Then /^I should (see|not see) (?:the|an?) "([^"]*)" table$/ do |visibility, table_id|
-  if visibility.eql?("see")
+  if visibility.eql?('see')
     should_see_table table_id
   else
     should_not_see_table table_id
@@ -136,9 +141,9 @@ Then /^I should see a switch for "([^"]*)" in the "([^"]*)" row that is in the "
   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
+  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"}'"
+    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
 end
 

data/features/step_definitions/text_field_steps.rb

@@ -8,21 +8,18 @@ Then /^I should not see "([^"]*)" text field$/ do |name|
   should_not_see_text_field name
 end
 
-
 Then /^I touch the clear button in the "([^"]*)" text field$/ do |name|
   should_see_clear_button_in_text_field name
   touch("textField marked:'#{name}' child button")
   step_pause
 end
 
-
 Then /^I should see a clear button in the text field in the "([^"]*)" row$/ do |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?
 end
 
-
 Then /^I touch the clear button in the text field in the "([^"]*)" row$/ do |row_id|
   query_str = "tableViewCell marked:'#{row_id}' child tableViewCellContentView child textField"
   res = query(query_str)
@@ -31,6 +28,9 @@ Then /^I touch the clear button in the text field in the "([^"]*)" row$/ do |row
   step_pause
 end
 
+Then(/^I should see "(.*?)" text field with text "(.*?)"$/) do |text_field_id, text|
+  should_see_text_field_with_text text_field_id, text
+end
 
 Then /^I should see "([^"]*)" in the text field "([^"]*)"$/ do |text, text_field|
   should_see_text_field_with_text text_field, text

data/features/step_definitions/text_view_steps.rb

@@ -1,9 +1,7 @@
-#include Briar::TextView
-
 Then /^I clear text view named "([^\"]*)"$/ do |name|
   res = query("textView marked:'#{name}'")
   if res
-    set_text("textView marked:'#{name}'", "")
+    set_text("textView marked:'#{name}'", '')
   end
 end
 
@@ -19,10 +17,6 @@ Then /^I should see the text I just entered in the "([^"]*)" text view$/ do |tex
   end
 end
 
-Then /^I am done text editing$/ do
-  touch_navbar_item "done text editing"
-end
-
 Then /^I should see text view "([^"]*)" with placeholder text "([^"]*)"$/ do |text_view, placeholder|
   tv_exists = !query("textView marked:'#{text_view}'").empty?
   unless tv_exists

data/lib/briar.rb

@@ -2,6 +2,8 @@
 
 DEVICE_ENDPOINT = (ENV['DEVICE_ENDPOINT'] || 'http://localhost:37265')
 AI = :accessibilityIdentifier
+TOUCH_TRANSITION_TIMEOUT = 30.0
+TOUCH_TRANSITION_RETRY_FREQ = 0.5
 
 require 'briar/version'
 require 'briar/gestalt'