briar 0.1.3.b4 → 0.1.3.b5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba56773bf8fafac50e0a6cda6bd3937469a00c58
-  data.tar.gz: 35b2ab49686b4449d22980b88978738e9f25a924
+  metadata.gz: 20943d437cd107ef7346f8b3f087202b566464cf
+  data.tar.gz: ed60404c7bda025024d86bbf0cbfdf87799593ec
 SHA512:
-  metadata.gz: 3d98468461361d5a17a3b5aeef32c91aa4b28dc4011ef21155d37d261cfc10eb667f0849703ab51734d9b336b33d4374c87563943b6001f58076b5eb3cb3bac0
-  data.tar.gz: 063c9190bcb096fe7b7b52d7fee8e5c6371fadc22195e4d1ceb6c3a2e3b7e526540b84f3e6b3dac1305e7af64d7e254d71c883fb7a3d2b1245f47649e1253cab
+  metadata.gz: b2838a7535afdd499736697c1e77e40901c6be432a5110a547ec9b1d705c949856dd9981f2e3e60e201b5b96a9d440048444026f780f6e357a2db287041f7637
+  data.tar.gz: 3aedf37a8e73a8449607da32c1c73ea9a37eb5c35bb171c510f58409ba9427ab1ddc3cf849a482abc633602550e32139312557908bed04e48deff14001f2cb1b

data/.gitignore

@@ -17,6 +17,8 @@ test/tmp
 test/version_tmp
 tmp
 
+.ruby-version
+
 # JetBrains
 .idea
 

data/features/step_definitions/control/segmented_control_steps.rb

@@ -15,7 +15,7 @@ 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|
-  deprecated('0.1.1', 'no replacement', :pending)
+  _deprecated('0.1.1', 'no replacement', :pending)
   #@associated_label = label_id
   #should_see_segment_with_selected_state @control_id, @segment_id, selectedness.eql?('is') ? 1 : 0
   ## unexpected!
@@ -25,19 +25,19 @@ Then /^I should see the segment I touched (is|is not) selected and the "([^"]*)"
 end
 
 Then /^I touch the segment again$/ do
-  deprecated('0.1.1', 'no replacement', :pending)
+  _deprecated('0.1.1', 'no replacement', :pending)
   #touch_segment @segment_id, @control_id
 end
 
 Then /^I should see the segment is not selected and the detail label is cleared$/ do
-  deprecated('0.1.1', 'no replacement', :pending)
+  _deprecated('0.1.1', 'no replacement', :pending)
   ## 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|
-  deprecated('0.1.1', 'no replacement', :pending)
+  _deprecated('0.1.1', 'no replacement', :pending)
   ## ugh - that @associated_label variable needs to be set
   #@associated_label = label_id
   #@associated_row = row_id
@@ -46,7 +46,7 @@ Then /^I should see the segment I touched (is|is not) selected and the "([^"]*)"
 end
 
 Then /^I should see the segment is not selected and the label in the row is cleared$/ do
-  deprecated('0.1.1', 'no replacement', :pending)
+  _deprecated('0.1.1', 'no replacement', :pending)
   ## 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|

data/features/step_definitions/email_steps.rb

@@ -1,5 +1,5 @@
 Then /^I should see email view with body that contains "([^"]*)"$/ do |text|
-  if not device.ios5?
+  if not ios5?
     warn_about_no_ios5_email_view
   else
     2.times { step_pause }
@@ -26,7 +26,7 @@ Then /^I touch the "([^"]*)" row and wait to see the email view$/ do |row_id|
 end
 
 Then /^I should see email view with "([^"]*)" in the subject$/ do |text|
-  if not device.ios5?
+  if not ios5?
     warn_about_no_ios5_email_view
   else
     wait_for_animation
@@ -38,7 +38,7 @@ Then /^I should see email view with "([^"]*)" in the subject$/ do |text|
 end
 
 Then /^I should see email view with recipients? "([^"]*)"$/ do |comma_sep_addrs|
-  if not device.ios5?
+  if not ios5?
     warn_about_no_ios5_email_view
   else
     should_see_recipients comma_sep_addrs
@@ -51,7 +51,7 @@ Then /^I should see email view with to field set to "([^"]*)"$/ do |text|
 end
 
 Then /^I should see email view with text like "([^"]*)" in the subject$/ do |text|
-  if not device.ios5?
+  if not ios5?
     warn_about_no_ios5_email_view
   else
     should_see_mail_view
@@ -78,7 +78,7 @@ Given(/^we are testing on the simulator or a device configured to send emails$/)
 end
 
 Given(/^I can test an email view$/) do
-  if (not device.ios5?) and (not uia_available?)
+  if (not ios5?) and (not uia_available?)
     warn_about_no_ios5_email_view
     pending('cannot test email views yet')
   end

data/features/step_definitions/keyboard_steps.rb

@@ -17,13 +17,12 @@ When /^I touch the done button the keyboard disappears$/ do
   should_not_see_keyboard
 end
 
-
 Then /^I touch the delete key$/ do
-  keyboard_send_backspace
+  keyboard_enter_char 'Delete'
 end
 
 Then(/^I turn off spell checking and capitalization$/) do
-  deprecated('0.1.1', 'not working', :pending)
+  _deprecated('0.1.1', 'not working', :pending)
   #should_see_keyboard
   #turn_autocapitalization_off
   #turn_autocorrect_off

data/features/step_definitions/picker/date_picker_steps.rb

@@ -1,3 +1,4 @@
+require 'benchmark'
 
 Then /^I change the time on the picker to "([^"]*)"$/ do |target_time|
   change_time_on_picker_with_time_str target_time

data/features/step_definitions/table_steps.rb

@@ -85,7 +85,7 @@ Then /^I should see that the text I just entered is in the "([^"]*)" row "([^"]*
 end
 
 Then /^I move the "([^"]*)" row (up|down) (\d+) times? using the reorder edit control$/ do |row_id, dir, n|
-  if device.ios7?
+  if ios7?
     pending 'reordering on iOS 7 (more specifically playback) is not supported'
   end
 
@@ -128,7 +128,7 @@ Then /^I should see a detail disclosure chevron in the "([^"]*)" row$/ do |row_i
 end
 
 Then /^I touch the "([^"]*)" switch in the "([^"]*)" row$/ do |switch_id, row_id|
-  deprecated('0.1.1', 'write a custom step', :warn)
+  _deprecated('0.1.1', 'write a custom step', :warn)
   touch_switch_in_row switch_id, row_id
 end
 

data/lib/briar.rb

@@ -13,6 +13,7 @@ BRIAR_POST_TIMEOUT=0.5
 ##################
 
 BRIAR_STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
+
 # we need an insanely long time out because of some changes in 0.9.163
 # the waits succeed after a short amount of time (visually < 1 sec),
 # but fail if the wait time out is too short (4s)
@@ -72,38 +73,39 @@ require 'briar/text_field'
 require 'briar/text_view'
 
 
+# <b>DEPRECATED</b> since 0.9.163
+#
+# replaced with:
+# * calabash function <tt>default_device</tt>
+# * methods in <tt>calabash-cucumber/environment_helpers.rb</tt>
+# * briar function <tt>default_device_or_create</tt>
 def device
-  deprecated('0.1.3', "use the calabash function 'default_device' instead", :warn)
-  @device = default_device()
-end
-
-def xamarin_test_cloud?
-  ENV['XAMARIN_TEST_CLOUD'] == '1'
-end
-
+  msg = "use the calabash function 'default_device', one of the methods in calabash-cucumber/environment_helpers.rb', or briar's 'default_device_or_create'"
+  _deprecated('0.9.163', msg, :warn)
+  default_device_or_create()
 
-# todo deprecated function does not output on a new line when called within cucumber
-def deprecated(version, msg, type)
-  allowed = [:pending, :warn]
-  unless allowed.include?(type)
-    screenshot_and_raise "type '#{type}' must be on of '#{allowed}'"
+  d = default_device()
+  if d.nil?
+    d = Calabash::Cucumber::Device.new(nil, server_version())
   end
+  d
+end
 
-  info = Kernel.caller.first
-
-  msg = "deprecated '#{version}' - '#{msg}'\n#{info}"
-
-  if type.eql?(:pending)
-    pending(msg)
-  else
-    warn "\nWARN: #{msg}"
+# returns the device that is currently being tested against
+#
+# returns the +device+ attr of <tt>Calabash::Cucumber::Launcher</tt> if
+# it is defined.  otherwise, creates a new <tt>Calabash::Cucumber::Device</tt>
+# by querying the server.
+#
+# raises an error if the server cannot be reached
+def default_device_or_create
+  device = default_device()
+  if device.nil?
+    device = Calabash::Cucumber::Device.new(nil, server_version())
   end
+  device
 end
 
 
 
 
-
-
-
-

data/lib/briar/alerts_and_sheets/alert_view.rb

@@ -8,7 +8,7 @@ module Briar
     # touch("view:'_UIModalItemAlertContentView' descendant view:'_UIModalItemTableViewCell'  marked:'OK'")
 
     def alert_exists? (alert_id=nil)
-      if device.ios7?
+      if uia_available?
         res = send_uia_command command: 'uia.alert() != null'
         res['value']
       else
@@ -41,26 +41,26 @@ module Briar
     end
 
     def should_see_alert_with_title (title, timeout=BRIAR_WAIT_TIMEOUT)
-      if device.ios7?
+      if ios7?
         warn 'WARN: cannot distinguish between alert titles and messages'
         should_see_alert
-        if uia_query(:view, marked: "#{title}").empty?
-          screenshot_and_raise "expected to see alert with title '#{title}'"
+        msg = "waited for '#{timeout}' but did not see an alert"
+        opts = wait_opts(msg, timeout)
+        wait_for(opts) do
+          not uia_query(:view, marked: "#{title}").empty?
         end
       else
         qstr = 'alertView child label'
         msg = "waited for '#{timeout}' for alert with title '#{title}'"
-        wait_for(:timeout => timeout,
-                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
-                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
-                 :timeout_message => msg) do
+        opts = wait_opts(msg, timeout)
+        wait_for(opts) do
           query(qstr, :text).include?(title)
         end
       end
     end
 
     def should_see_alert_with_message (message, timeout=BRIAR_WAIT_TIMEOUT)
-      if device.ios7?
+      if ios7?
         warn 'WARN: cannot distinguish between alert titles and messages'
         should_see_alert
         if uia_query(:view, marked: "#{message}").empty?
@@ -79,7 +79,7 @@ module Briar
     end
 
     def alert_button_exists? (button_id)
-      if device.ios7?
+      if uia_available?
         should_see_alert
         not uia_query(:view, marked: "#{button_id}").empty?
       else
@@ -95,7 +95,7 @@ module Briar
 
     def dismiss_alert_with_button (button_label)
       touch_alert_button(button_label)
-      if device.ios7?
+      if uia_available?
         wait_for_view_to_disappear button_label
       else
         wait_for_view_to_disappear 'alertView'
@@ -105,7 +105,7 @@ module Briar
 
     def touch_alert_button(button_title)
       should_see_alert
-      if device.ios7?
+      if ios7?
         touch("view marked:'#{button_title}'")
       else
         touch("alertView child button marked:'#{button_title}'")

data/lib/briar/bars/toolbar.rb

@@ -104,7 +104,7 @@ module Briar
                        :toolbar_id => nil}
         opts = default_opts.merge(opts)
       else
-        deprecated('0.1.2',
+        _deprecated('0.1.2',
                    "second argument should be a hash - found '#{opts}'",
                    :warn)
         opts = {:wait_for_view => opts[:wait_for_view],

data/lib/briar/briar_core.rb

@@ -50,7 +50,7 @@ module Briar
         screenshot_and_raise "should see view with id '#{view_id}'"
       end
 
-      actual_ht = {x: res['rect']['center_x'].to_f, y: res['rect']['center_y'].to_f}
+      actual_ht = {:x =>  res['rect']['center_x'].to_f, :y =>  res['rect']['center_y'].to_f}
 
       unless actual_ht == center_ht
         screenshot_and_raise "#{view_id} has center '#{actual_ht}' but should have center '#{center_ht}'"

data/lib/briar/email.rb

@@ -4,7 +4,7 @@ module Briar
   module Email
 
     def email_testable?
-      return true if device.ios5?
+      return true if ios5?
       uia_available?
     end
 
@@ -21,7 +21,7 @@ module Briar
     end
 
     def email_body_contains? (text)
-      if device.ios5?
+      if ios5?
         !query("view:'MFComposeTextContentView' {text LIKE '*#{text}*'}").empty?
       else
         warn 'WARN: iOS > 5 detected - cannot test for email body text'
@@ -33,7 +33,7 @@ module Briar
     end
 
     def email_subject_is? (text)
-      if device.ios5?
+      if ios5?
         email_subject.eql? text
       else
         warn 'WARN: iOS > 5 detected - cannot test for email subject text'
@@ -41,7 +41,7 @@ module Briar
     end
 
     def email_subject_has_text_like? (text)
-      if device.ios5?
+      if ios5?
         !query("view:'MFComposeSubjectView' {text LIKE '*#{text}*'}").empty?
       else
         warn 'WARN: iOS > 5 detected - cannot test for email subject text'
@@ -53,7 +53,7 @@ module Briar
     end
 
     def email_to_field_is? (text)
-      if device.ios5?
+      if ios5?
         email_to.eql? text
       else
         warn 'WARN: iOS > 5 detected - cannot test for email to field'
@@ -94,13 +94,13 @@ module Briar
       timeout = opts[:timeout]
       msg = "waited for '#{timeout}' seconds but did not see email compose view"
       #noinspection RubyParenthesesAfterMethodCallInspection
-      dev = device()
+
       email_view_mark = opts[:email_view_mark]
       wait_for(:timeout => timeout,
                :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
                :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
-        if dev.ios5?
+        if ios5?
           is_ios5_mail_view
         else
           view_exists? email_view_mark
@@ -110,7 +110,7 @@ module Briar
 
     #noinspection RubyResolve
     def device_can_send_email
-      return true if device.simulator?
+      return true if simulator?
       if defined? backdoor_device_configured_for_mail?
         backdoor_device_configured_for_mail?
       else
@@ -120,7 +120,6 @@ module Briar
 
     def delete_draft_and_wait_for (view_id, opts={})
 
-
       if email_not_testable?
         warn_about_no_ios5_email_view
         return
@@ -133,10 +132,7 @@ module Briar
       # does a wait for iOS > 5 + uia available
       should_see_mail_view opts
 
-      #noinspection RubyParenthesesAfterMethodCallInspection
-      device = device()
-
-      if device.ios5?
+      if ios5?
         touch_navbar_item_and_wait_for_view 'Cancel', 'Delete Draft'
         step_pause
         touch_sheet_button_and_wait_for_view 'Delete Draft', view_id
@@ -147,12 +143,11 @@ module Briar
           pending "iOS > 5 detected AND orientation '#{sbo}' - there is a bug in UIAutomation that prohibits touching the cancel button"
         end
 
-        # might also occur on devices, but i don't know
-        if sbo.eql?(:up) and device.ipad? and device.simulator?
-          pending "iOS > 5 detected AND orientation '#{sbo}' AND simulator - there is a bug in UIAutomation prohibits touching the cancel button"
+        if sbo.eql?(:up) and ipad?
+          pending "iOS > 5 detected AND orientation '#{sbo}' AND ipad - there is a bug in UIAutomation prohibits touching the cancel button"
         end
 
-        timeout = BRIAR_WAIT_TIMEOUT * 2
+        timeout = BRIAR_WAIT_TIMEOUT
         msg = "waited for '#{timeout}' seconds but did not see cancel button"
         wait_for(:timeout => timeout,
                  :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
@@ -178,7 +173,7 @@ module Briar
     end
 
     def uia_touch_email_to (opts={})
-      default_opts = {:await_keyboard => true}
+      default_opts = {:wait_for_keyboard => true}
       opts = default_opts.merge(opts)
 
       if uia_not_available?
@@ -190,11 +185,11 @@ module Briar
       point = {:x => rect['x'] + (2 * rect['width']),
                :y => rect['y']}
       uia_touch_with_options(point)
-      uia_await_keyboard if opts[:await_keyboard]
+      uia_wait_for_keyboard if opts[:wait_for_keyboard]
     end
 
     def uia_set_email_to(addresses, opts={})
-      default_opts = {:await_keyboard => true}
+      default_opts = {:wait_for_keyboard => true}
       opts = default_opts.merge(opts)
       uia_touch_email_to opts
       addresses.each do |addr|
@@ -209,7 +204,7 @@ module Briar
     end
 
     def uia_send_email_to(addresses, opts={})
-      default_opts = {:await_keyboard => true}
+      default_opts = {:wait_for_keyboard => true}
       opts = default_opts.merge(opts)
       uia_set_email_to addresses, opts
       uia_touch_send_email

data/lib/briar/keyboard/keyboard.rb

@@ -72,7 +72,7 @@ module Briar
 
     #noinspection RubyUnusedLocalVariable
     def briar_clear_text(view_id, timeout=5)
-      deprecated('0.1.1', "will remove 'timeout' argument in a future release", :warn)
+      _deprecated('0.1.1', "will remove 'timeout' argument in a future release", :warn)
       clear_text("view marked:'#{view_id}'")
 
       # i really wanted this to work, but there are too many issues with the
@@ -93,7 +93,7 @@ module Briar
 
     #noinspection RubyUnusedLocalVariable
     def set_autocapitalization (type)
-      deprecated('0.1.1', 'does not work', :pending)
+      _deprecated('0.1.1', 'does not work', :pending)
       #if !query('textView index:0').empty?
       #  query('textView index:0', [{setAutocapitalizationType: type}])
       #elsif !query('textField index:0').empty?
@@ -104,13 +104,13 @@ module Briar
     end
 
     def turn_autocapitalization_off
-      deprecated('0.1.1', 'does not work', :pending)
+      _deprecated('0.1.1', 'does not work', :pending)
       #set_autocapitalization UITextAutocapitalizationTypeNone
     end
 
     #noinspection RubyUnusedLocalVariable
     def set_autocorrect (type)
-      deprecated('0.1.1', 'does not work', :pending)
+      _deprecated('0.1.1', 'does not work', :pending)
       #if !query('textView index:0').empty?
       #  query('textView index:0', [{setAutocorrectionType: type}])
       #elsif !query('textField index:0').empty?
@@ -121,12 +121,12 @@ module Briar
     end
 
     def turn_autocorrect_off
-      deprecated('0.1.1', 'does not work', :pending)
+      _deprecated('0.1.1', 'does not work', :pending)
       # set_autocorrect UITextAutocorrectionTypeNo
     end
 
     def turn_spell_correct_off
-      deprecated('0.1.1', 'does not work', :pending)
+      _deprecated('0.1.1', 'does not work', :pending)
       #if !query('textView index:0').empty?
       #  query('textView index:0', [{setSpellCheckingType: UITextSpellCheckingTypeNo}])
       #elsif !query('textField index:0').empty?

data/lib/briar/keyboard/uia_keyboard_language.rb

@@ -18,20 +18,20 @@ module Briar
       # 3 <== there is no international button
       # 4 <== there is an international button
       def keyboard_has_international? (opts={})
-        default_opts = {:await_keyboard => false}
+        default_opts = {:wait_for_keyboard => false}
         opts = default_opts.merge(opts)
-        await_keyboard if opts[:await_keyboard]
+        wait_for_keyboard if opts[:wait_for_keyboard]
         res = uia('UIATarget.localTarget().frontMostApp().keyboard().buttons().length')
         button_count = res['value']
         button_count == 4
       end
 
       def touch_international_key(opts={})
-        default_opts = {:await_keyboard => false,
+        default_opts = {:wait_for_keyboard => false,
                         :step_pause => 0.4}
         opts = default_opts.merge(opts)
 
-        await_keyboard if opts[:await_keyboard]
+        wait_for_keyboard if opts[:wait_for_keyboard]
 
         unless keyboard_has_international?
           screenshot_and_raise 'could not find an international key on the keyboard'
@@ -53,9 +53,9 @@ module Briar
       # when looking at elements() the space bar will be at the penultimate index
       # when looking at keys() the space bar index seems to float around
       def spacebar_label (opts={})
-        default_opts = {:await_keyboard => false}
+        default_opts = {:wait_for_keyboard => false}
         opts = default_opts.merge(opts)
-        await_keyboard if opts[:await_keyboard]
+        wait_for_keyboard if opts[:wait_for_keyboard]
         elm_count = uia('UIATarget.localTarget().frontMostApp().keyboard().elements().length')['value']
         spacebar_idx = elm_count - 2
         res = uia("UIATarget.localTarget().frontMostApp().keyboard().elements()[#{spacebar_idx}].label()")
@@ -63,37 +63,37 @@ module Briar
       end
 
       def spacebar_has_label?(label, opts={})
-        default_opts = {:await_keyboard => false}
+        default_opts = {:wait_for_keyboard => false}
         opts = default_opts.merge(opts)
-        await_keyboard if opts[:await_keyboard]
+        wait_for_keyboard if opts[:wait_for_keyboard]
         spacebar_label.eql?(label)
       end
 
       def english_keyboard? (opts={})
-        default_opts = {:await_keyboard => false}
+        default_opts = {:wait_for_keyboard => false}
         opts = default_opts.merge(opts)
-        await_keyboard if opts[:await_keyboard]
+        wait_for_keyboard if opts[:wait_for_keyboard]
         spacebar_has_label? BRIAR_LANGUAGE_KEYS[:en]
       end
 
       def german_keyboard? (opts={})
-        default_opts = {:await_keyboard => false}
+        default_opts = {:wait_for_keyboard => false}
         opts = default_opts.merge(opts)
-        await_keyboard if opts[:await_keyboard]
+        wait_for_keyboard if opts[:wait_for_keyboard]
         spacebar_has_label? BRIAR_LANGUAGE_KEYS[:de]
       end
 
       def romaji_keyboard? (opts={})
-        default_opts = {:await_keyboard => false}
+        default_opts = {:wait_for_keyboard => false}
         opts = default_opts.merge(opts)
-        await_keyboard if opts[:await_keyboard]
+        wait_for_keyboard if opts[:wait_for_keyboard]
         spacebar_has_label? BRIAR_LANGUAGE_KEYS[:ja]
       end
 
       def touch_international_until_language(language_key, opts={})
-        default_opts = {:await_keyboard => false}
+        default_opts = {:wait_for_keyboard => false}
         opts = default_opts.merge(opts)
-        await_keyboard if opts[:await_keyboard]
+        wait_for_keyboard if opts[:wait_for_keyboard]
 
         unless keyboard_has_international?
           screenshot_and_raise 'keyboard does not have an international key'

data/lib/briar/keyboard/uia_numeric_keyboard.rb

@@ -5,18 +5,21 @@ module Briar
     module Numeric
 
       def is_numeric_keyboard?(opts={})
-        default_opts = {:await_keyboard => false}
+        if uia_not_available?
+          pending('this feature is nyi')
+        end
+        default_opts = {:wait_for_keyboard => false}
         opts = default_opts.merge(opts)
-        await_keyboard if opts[:await_keyboard]
+        wait_for_keyboard if opts[:wait_for_keyboard]
         res = uia('UIATarget.localTarget().frontMostApp().keyboard().keys().length')['value']
         res == 12
       end
 
       def keyboard_send_numeric_backspace(opts={})
-        default_opts = {:await_keyboard => false}
+        default_opts = {:wait_for_keyboard => false}
         opts = default_opts.merge(opts)
-        await_keyboard if opts[:await_keyboard]
-        if ios7?
+        wait_for_keyboard if opts[:wait_for_keyboard]
+        if uia_available?
           uia('UIATarget.localTarget().frontMostApp().keyboard().buttons()[0].tap()')
         else
           keyboard_enter_char 'Delete'
@@ -24,15 +27,16 @@ module Briar
       end
 
       def keyboard_send_backspace(opts={})
-        default_opts = {:await_keyboard => false}
+        default_opts = {:wait_for_keyboard => false}
         opts = default_opts.merge(opts)
-        await_keyboard if opts[:await_keyboard]
+        wait_for_keyboard if opts[:wait_for_keyboard]
         if is_numeric_keyboard?
           keyboard_send_numeric_backspace
         else
-          keyboard_send_backspace
+          keyboard_enter_char 'Delete'
         end
       end
     end
   end
-end
+end
+

data/lib/briar/picker/date_picker_core.rb

@@ -23,7 +23,7 @@ BRIAR_PICKER_12H_BRIEF_DATE_FMT = '%a %b %e'
 BRIAR_DATE_FORMATS = {:brief_24h => BRIAR_PICKER_24H_BRIEF_DATE_FMT,
                       :brief_12h => BRIAR_PICKER_12H_BRIEF_DATE_FMT}
 
-
+# todo briar picker should be a class - 1 instance per picker
 module Briar
   module Picker
     module DateCore
@@ -38,14 +38,37 @@ module Briar
         query_str
       end
 
-      def ruby_time_from_picker (options = {:picker_id => nil,
-                                            :convert_time_to_utc => false})
-        picker_id = picker_id_from_options options
+      def ruby_time_from_picker (options = {})
+        if not options.is_a?(Hash) or options == nil
+          if options == nil
+            msg = "'picker_id' argument has been replaced with options hash; pass '{:picker_id => nil}' instead"
+            options = {:picker_id => nil}
+          else
+            msg = "'picker_id' argument has been replaced with options hash; pass '{:picker_id => #{options}}' instead"
+            options = {:picker_id => options}
+          end
+          _deprecated('0.1.3', msg, :warn)
+        end
+
+        default_options = {:picker_id => nil,
+                           :convert_time_to_utc => false,
+                           :assert_mode => true,
+                           :assert_picker => true}
+        options = default_options.merge(options)
 
-        if picker_is_in_countdown_mode picker_id
-          screenshot_and_raise 'method is not available for pickers that are not in date or date time mode'
+        picker_id = options[:picker_id]
+
+        if options[:assert_mode]
+          if picker_is_in_countdown_mode picker_id
+            screenshot_and_raise 'method is not available for pickers that are not in date or date time mode'
+          end
         end
-        query_str = should_see_date_picker picker_id
+
+        if options[:assert_picker]
+          should_see_date_picker picker_id
+        end
+
+        query_str = query_string_for_picker(picker_id)
         res = query(query_str, :date)
         if res.empty?
           screenshot_and_raise "should be able to get date from picker with query '#{query_str}'"
@@ -192,72 +215,125 @@ module Briar
       end
 
       # get the times off the picker in 12h and 24h format
-      def picker_time_str(format_key, options={:picker_id => nil,
-                                               :convert_time_to_utc => false})
-        picker_id = picker_id_from_options options
-
-        if picker_is_in_date_mode picker_id or picker_is_in_countdown_mode picker_id
-          screenshot_and_raise 'the time is not applicable for this mode'
+      def picker_time_str(format_key, options={})
+        default_options = {:picker_id => nil,
+                           :convert_time_to_utc => false,
+                           :time_on_picker => nil,
+                           :assert_mode => true}
+        options = default_options.merge(options)
+
+        picker_id = options[:picker_id]
+
+        if options[:assert_mode]
+          if picker_is_in_date_mode picker_id or picker_is_in_countdown_mode picker_id
+            screenshot_and_raise 'the time is not applicable for this mode'
+          end
         end
+
         format = BRIAR_TIME_FORMATS[format_key]
         unless format
           screenshot_and_raise "format '#{format_key}' was not one of '#{BRIAR_TIME_FORMATS}'"
         end
 
-        time = ruby_time_from_picker options
+        time = options[:time_on_picker] || ruby_time_from_picker(options)
         time.strftime(format).strip.sub(BRIAR_REMOVE_LEADING_ZERO_REGEX, '')
       end
 
 
-      def picker_time_strs_hash(options={:picker_id => nil,
-                                         :convert_time_to_utc => false})
-        picker_id = picker_id_from_options options
-        if picker_is_in_date_mode picker_id or picker_is_in_countdown_mode picker_id
-          screenshot_and_raise 'the time is not applicable for this mode'
+      def picker_time_strs_hash(options={})
+        default_options = {:picker_id => nil,
+                           :convert_time_to_utc => false,
+                           :time_on_picker => nil,
+                           :assert_mode => true}
+        options = default_options.merge(options)
+        picker_id = options[:picker_id]
+
+        if options[:assert_mode]
+          if picker_is_in_date_mode picker_id or picker_is_in_countdown_mode picker_id
+            screenshot_and_raise 'the time is not applicable for this mode'
+          end
         end
 
         {:h24 => picker_time_str(:h24, options),
          :h12 => picker_time_str(:h12, options)}
       end
 
-      def picker_time_strs_arr(options={:picker_id => nil,
-                                        :convert_time_to_utc => false})
-        picker_id = picker_id_from_options options
-        if picker_is_in_date_mode picker_id or picker_is_in_countdown_mode picker_id
-          screenshot_and_raise 'the time is not applicable for this mode'
+      def picker_time_strs_arr(options={})
+
+        default_options = {:picker_id => nil,
+                           :convert_time_to_utc => false,
+                           :time_on_picker => nil,
+                           :assert_mode => true}
+        options = default_options.merge(options)
+
+        picker_id = options[:picker_id]
+
+        if options[:assert_mode]
+          if picker_is_in_date_mode picker_id or picker_is_in_countdown_mode picker_id
+            screenshot_and_raise 'the time is not applicable for this mode'
+          end
         end
         [picker_time_str(:h24, options), picker_time_str(:h12, options)]
       end
 
-      def picker_brief_date_str(format_key, options={:picker_id => nil,
-                                                     :convert_time_to_utc => false})
-        picker_id = picker_id_from_options options
-        if picker_is_in_countdown_mode picker_id
-          screenshot_and_raise 'date is not applicable for this mode'
+      def picker_brief_date_str(format_key, options={})
+
+        default_options = {:picker_id => nil,
+                           :convert_time_to_utc => false,
+                           :time_on_picker => nil,
+                           :assert_mode => true}
+        options = default_options.merge(options)
+
+        picker_id = options[:picker_id]
+
+        if options[:assert_mode]
+          if picker_is_in_countdown_mode picker_id
+            screenshot_and_raise 'date is not applicable for this mode'
+          end
         end
+
         format = BRIAR_DATE_FORMATS[format_key]
         unless format
           screenshot_and_raise "format '#{format_key}' is not one of '#{BRIAR_DATE_FORMATS.keys}'"
         end
-        time = ruby_time_from_picker options
+
+        time = options[:time_on_picker] || ruby_time_from_picker(options)
         time.strftime(format).strip.squeeze(' ')
       end
 
-      def picker_brief_date_strs_hash(options={:picker_id => nil,
-                                               :convert_time_to_utc => false})
-        picker_id = picker_id_from_options options
-        if picker_is_in_countdown_mode picker_id
-          screenshot_and_raise 'date is not applicable for this mode'
+      def picker_brief_date_strs_hash(options={})
+
+        default_options = {:picker_id => nil,
+                           :convert_time_to_utc => false,
+                           :time_on_picker => nil,
+                           :assert_mode => true}
+        options = default_options.merge(options)
+
+        picker_id = options[:picker_id]
+
+        if options[:assert_mode]
+          if picker_is_in_countdown_mode picker_id
+            screenshot_and_raise 'date is not applicable for this mode'
+          end
         end
         {:brief_24h => picker_brief_date_str(:brief_24h, options),
          :brief_12h => picker_brief_date_str(:brief_12h, options)}
       end
 
-      def picker_brief_date_strs_arr(options={:picker_id => nil,
-                                              :convert_time_to_utc => false})
-        picker_id = picker_id_from_options options
-        if picker_is_in_countdown_mode picker_id
-          screenshot_and_raise 'date is not applicable for this mode'
+      def picker_brief_date_strs_arr(options={})
+
+        default_options = {:picker_id => nil,
+                           :convert_time_to_utc => false,
+                           :time_on_picker => nil,
+                           :assert_mode => true}
+        options = default_options.merge(options)
+
+        picker_id = options[:picker_id]
+
+        if options[:assert_mode]
+          if picker_is_in_countdown_mode picker_id
+            screenshot_and_raise 'date is not applicable for this mode'
+          end
         end
         [picker_brief_date_str(:brief_24h, options), picker_brief_date_str(:brief_12h, options)]
       end

data/lib/briar/picker/date_picker_manipulation.rb

@@ -1,5 +1,6 @@
 require 'calabash-cucumber'
 require 'date'
+require 'benchmark'
 
 =begin
 
@@ -19,7 +20,7 @@ options ==>
 # WARN: only set this if you need times converted to UTC - if you are in UTC
 # timezone, don't set this
 :convert_time_to_utc => false,
-# animat the change
+# animate the change
 :animate => true,
 # optionally pass the picker id
 :picker_id => nil,
@@ -89,7 +90,7 @@ module Briar
       end
 
       def target_date_for_change_time_on_picker_with_time(target_time, convert, picker_id=nil)
-        current_time = ruby_time_from_picker picker_id
+        current_time = ruby_time_from_picker({:picker_id => picker_id})
         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,
@@ -136,23 +137,32 @@ module Briar
                                                          :picker_id => nil,
                                                          :notify_targets => true})
 
+
         picker_id = picker_id_from_options options
         unless picker_is_in_time_mode picker_id or picker_is_in_date_and_time_mode picker_id
           screenshot_and_raise 'picker is not in date time or time mode'
         end
 
+
         should_see_date_picker picker_id
 
+
         convert = convert_to_utc_from_options options
 
+
         ensure_can_change_picker_to_date target_dt, picker_id
 
+
         target_str = convert_date_time_to_objc_fmt target_dt, convert
         fmt_str = date_format_for_target(:objc, convert ? :zoned : :default)
 
+
         args = args_for_change_date_on_picker options
+
+
         query_str = query_string_for_picker picker_id
 
+
         views_touched = map(query_str, :changeDatePickerDate, target_str, fmt_str, *args)
 
         if views_touched.empty? or views_touched.member? '<VOID>'
@@ -169,9 +179,12 @@ module Briar
                                                                     :animate => true,
                                                                     :picker_id => nil,
                                                                     :notify_targets => true})
+
         convert = convert_to_utc_from_options options
         picker_id = picker_id_from_options options
+
         target_dt = target_date_for_change_time_on_picker_with_time_str time_str, convert, picker_id
+
         change_picker_date_time target_dt, options
       end
 
@@ -204,10 +217,22 @@ module Briar
       end
 
 
-      def set_briar_date_picker_variables(target_dt, options={:picker_id => nil,
-                                                              :convert_time_to_utc => false})
-        picker_id = picker_id_from_options options
-        if picker_is_in_date_and_time_mode picker_id or picker_is_in_time_mode picker_id
+      def set_briar_date_picker_variables(target_dt, options={})
+        default_options = {:picker_id => nil,
+                           :convert_time_to_utc => false,
+                           :assert_mode => false}
+        options = default_options.merge(options)
+
+        options[:assert_picker] = false
+        ruby_picker_time = ruby_time_from_picker options
+
+        options[:time_on_picker] = ruby_picker_time
+
+
+        picker_mode = picker_mode(options[:picker_id])
+
+        if picker_mode == UIDatePickerModeDateAndTime or
+              picker_mode == UIDatePickerModeTime
           @date_picker_time_12h = picker_time_str :h12, options
           @date_picker_time_24h = picker_time_str :h24, options
           @date_picker_time_hash = picker_time_strs_hash options

data/lib/briar/table.rb

@@ -208,7 +208,7 @@ module Briar
 
     def touch_row_and_wait_to_see(row_id, view, opts={})
       if (not opts.is_a?(Hash)) and (not opts.nil?)
-        deprecated('0.1.3',
+        _deprecated('0.1.3',
                    "you should no longer pass a table_id '#{opts}' as an arg, pass opts hash instead",
                    :warn)
         opts = {:table_id => opts}
@@ -241,7 +241,7 @@ module Briar
     end
 
     def swipe_on_row (dir, row_id, table_id=nil)
-      if device.ios7? and device.simulator?
+      if ios7? and simulator?
         pending('swiping on rows is not available on iOS 7 because of a bug in Xcode 5 simulator')
       end
       wait_for_row row_id, {:table_id => table_id}
@@ -260,11 +260,11 @@ module Briar
     end
 
     def query_str_for_confirm_delete_in_row(row_id, table_id=nil)
-      if device.ios5?
+      if ios5?
         # it is not either of those...
         pending 'cannot detect the confirm delete button (yet) in iOS 5'
       end
-      mark = device.ios7? ? 'Delete' : 'Confirm Deletion'
+      mark = ios7? ? 'Delete' : 'Confirm Deletion'
       "#{query_str_for_row row_id, table_id} descendant control marked:'#{mark}'"
     end
 
@@ -343,7 +343,7 @@ module Briar
     def should_see_switch_in_row_with_state (switch_id, row_id, state, opts={})
 
       if (not opts.is_a?(Hash)) and (not opts.nil?)
-        deprecated('0.1.1',
+        _deprecated('0.1.1',
                    "you should no longer pass a table_id '#{opts}' as an arg, pass opts hash instead",
                    :warn)
         opts = {:table_id => opts}
@@ -412,7 +412,7 @@ module Briar
 
     def touch_switch_in_row (switch_id, row_id, opts={})
       if (not opts.is_a?(Hash)) and (not opts.nil?)
-        deprecated('0.1.1',
+        _deprecated('0.1.1',
                    "you should no longer pass a table_id '#{opts}' pass a hash instead",
                    :warn)
         opts = {:table_id => opts}

data/lib/briar/text_field.rb

@@ -24,7 +24,7 @@ module Briar
       ht = query("textField marked:'#{text_field_id}' child button child imageView", :frame).first
       return false if ht.nil?
 
-      if device.ios7?
+      if ios7?
         ht['X'] == 2.5 and ht['Y'] == 2.5 and ht['Width'] == 14 and ht['Height'] == 14
       else
         ht['X'] == 0 and ht['Y'] == 0 and ht['Width'] == 19 and ht['Height'] == 19

data/lib/briar/uia/briar_ipad_emulation.rb

@@ -16,7 +16,7 @@ module Briar
         def current_device
           if device_internal.nil?
             #noinspection RubyParenthesesAfterMethodCallInspection
-            @device_internal = device()
+            @device_internal = default_device_or_create()
           end
           @device_internal
         end

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '0.1.3.b4'
+  VERSION = '0.1.3.b5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 0.1.3.b4
+  version: 0.1.3.b5
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber
@@ -145,10 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
-summary: briar-0.1.3.b4
+summary: briar-0.1.3.b5
 test_files:
 - features/step_definitions/alerts_and_sheets/action_sheet_steps.rb
 - features/step_definitions/alerts_and_sheets/alert_view_steps.rb