briar 0.1.2 → 0.1.3.b1

data/lib/briar/bars/tabbar.rb

@@ -26,7 +26,7 @@ module Briar
     def touch_tabbar_item(name, wait_for_view_id=nil)
       sleep(0.2)
       wait_for(:timeout => BRIAR_WAIT_TIMEOUT,
-               :retry_frequency => BRIAR_RETRY_FREQ) do
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ) do
         index_of_tabbar_item(name) != nil
       end
       should_see_tabbar

data/lib/briar/bars/toolbar.rb

@@ -56,8 +56,8 @@ module Briar
       end
 
       options = {:timeout => timeout,
-                 :retry_frequency => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg}
       wait_for(options) do
         toolbar_button_exists? button_id, opts
@@ -73,8 +73,8 @@ module Briar
     def wait_for_toolbar_to_disappear(toolbar_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but i still see toolbar marked: '#{toolbar_id}'"
       options = {:timeout => timeout,
-                 :retry_frequency => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg}
 
       wait_for(options) do
@@ -86,8 +86,8 @@ module Briar
     def wait_for_toolbar(toolbar_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see toolbar marked: '#{toolbar_id}'"
       options = {:timeout => timeout,
-                 :retry_frequency => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg}
       wait_for(options) do
         toolbar_exists? toolbar_id
@@ -104,10 +104,12 @@ module Briar
                        :toolbar_id => nil}
         opts = default_opts.merge(opts)
       else
-        warn("WARN: deprecated 0.1.2: second argument should be a hash - found '#{opts}'")
+        deprecated('0.1.2',
+                   "second argument should be a hash - found '#{opts}'",
+                   :warn)
         opts = {:wait_for_view => opts[:wait_for_view],
-               :timeout => BRIAR_WAIT_TIMEOUT,
-               :toolbar_id => nil}
+                :timeout => BRIAR_WAIT_TIMEOUT,
+                :toolbar_id => nil}
       end
 
       should_see_toolbar_button button_id, opts
@@ -120,8 +122,8 @@ module Briar
         timeout = opts[:timeout]
         msg = "touched '#{button_id}' and waited for '#{timeout}' sec but did not see '#{wait_for_view}'"
         options = {:timeout => timeout,
-                   :retry_frequency => BRIAR_RETRY_FREQ,
-                   :post_timeout => BRIAR_POST_TIMEOUT,
+                   :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                   :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                    :timeout_message => msg}
         wait_for(options) do
           view_exists? wait_for_view

data/lib/briar/briar_core.rb

@@ -57,15 +57,6 @@ module Briar
       end
     end
 
-    def should_see_view_after_animation (view_id)
-      pending "WARN: deprecated 0.0.8 - use 'wait_for_view #{view_id}' instead"
-
-    end
-
-    def should_not_see_view_after_animation (view_id)
-      pending "WARN: deprecated 0.0.8 - use 'wait_for_view_to_disappear #{view_id}' instead"
-    end
-
     def should_see_view_with_text (text)
       res = view_exists_with_text? text
       unless res
@@ -83,11 +74,18 @@ module Briar
       wait_for_view(view_to_wait_for, timeout)
     end
 
+    def wait_opts(msg, timeout)
+      {:timeout => timeout,
+       :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+       :post_timeout => BRIAR_WAIT_STEP_PAUSE,
+       :timeout_message => msg}
+    end
+
     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 => BRIAR_RETRY_FREQ,
-               :post_timeout => BRIAR_POST_TIMEOUT,
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+               :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
         view_exists? view_id
       end
@@ -96,8 +94,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 => BRIAR_RETRY_FREQ,
-               :post_timeout => BRIAR_POST_TIMEOUT,
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+               :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
         !query(qstr).empty?
       end
@@ -106,8 +104,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 => BRIAR_RETRY_FREQ,
-               :post_timeout => BRIAR_POST_TIMEOUT,
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+               :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
         !query("view:'#{view_class}' marked:'#{view_id}'").empty?
       end
@@ -129,8 +127,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 => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg}
       wait_for(options) do
         views.all? { |view_id| view_exists?(view_id) }
@@ -140,8 +138,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 => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg}
       wait_for(options) do
         not view_exists? view_id
@@ -166,7 +164,11 @@ module Briar
 
       array = args.kind_of?(Array) ? args : [args]
       json = "{\":selector\" : \"#{command}\", \":args\" : #{array}}"
-      backdoor('calabash_backdoor_handle_command:', json)
+      res = backdoor('calabash_backdoor_handle_command:', json)
+      if res.eql?('ERROR: no matching selector')
+        screenshot_and_raise "no matching backdoor selector found for '#{command}'"
+      end
+      res
     end
 
     def tokenize_list (list)

data/lib/briar/briar_uia.rb

@@ -40,7 +40,7 @@ module Briar
     def uia_touch_with_options(point, opts={})
       defaults = {:tap_count => 1,
                   :touch_count => 1,
-                  :duration => 1.0}
+                  :duration => 0.0}
       opts = defaults.merge(opts)
       pt = "{x: #{point[:x]}, y: #{point[:y]}}"
       args = "{tapCount: #{opts[:tap_count]}, touchCount: #{opts[:touch_count]}, duration: #{opts[:duration]}}"
@@ -50,11 +50,24 @@ module Briar
     def dismiss_ipad_keyboard
       screenshot_and_raise 'cannot dismiss keyboard on iphone' if iphone?
       screenshot_and_raise 'cannot dismiss keyboard without launching with instruments' unless uia_available?
-      send_uia_command command:"uia.keyboard().buttons()['Hide keyboard'].tap()"
+      send_uia_command command: "uia.keyboard().buttons()['Hide keyboard'].tap()"
       step_pause
     end
 
     def make_ipad_emulation_1x
+      #irb(main):040:0> uia('UIATarget.localTarget().frontMostApp().windows()[2].buttons()[0].label()')
+      #{
+      #      "status" => "success",
+      #      "value" => "Switch to normal mode",
+      #      "index" => 21
+      #}
+      #irb(main):041:0> uia('UIATarget.localTarget().frontMostApp().windows()[2].buttons()[0].label()')
+      #{
+      #      "status" => "success",
+      #      "value" => "Switch to full screen mode",
+      #      "index" => 22
+      #}
+
       device = device()
       unless device.ipad?
         pending 'this trick only works on the iPad'
@@ -70,16 +83,16 @@ module Briar
 
       # this only works because iPhone apps emulated on iPads in iOS 7 _always_
       # launch at 2x
-      uia_touch_with_options({x:738, y:24})
+      uia_touch_with_options({x: 738, y: 24})
       step_pause
     end
 
     def ensure_ipad_emulation_1x
       device = device()
       if device.ipad? and device.ios7? and uia_available?
-        uia_touch_with_options({x:738, y:24})
+        uia_touch_with_options({x: 738, y: 24})
       end
     end
 
   end
-end
+end

data/lib/briar/control/button.rb

@@ -4,6 +4,7 @@ module Briar
   module Control
     module Button
       include Briar::Core
+
       def button_exists? (button_id)
         res = query("button marked:'#{button_id}'", :alpha)
         if res.empty?
@@ -54,9 +55,9 @@ 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 => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
-                 :timeout_message => msg ) do
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
+                 :timeout_message => msg) do
           button_exists? button_id
         end
       end
@@ -64,9 +65,9 @@ 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 => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
-                 :timeout_message => msg ) do
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
+                 :timeout_message => msg) do
           button_exists? button_id
         end
         should_see_button_with_title(button_id, title)

data/lib/briar/control/segmented_control.rb

@@ -1,3 +1,5 @@
+require 'calabash-cucumber'
+
 module Briar
   module Control
     module Segmented_Control
@@ -20,7 +22,7 @@ module Briar
         num_segs = query(qstr, :numberOfSegments).first.to_i
         idx = 0
         while idx < num_segs
-          title = query(qstr, {titleForSegmentAtIndex:idx}).first
+          title = query(qstr, {titleForSegmentAtIndex: idx}).first
           return idx if title.eql?(segment_id)
           idx = idx + 1
         end
@@ -59,7 +61,7 @@ module Briar
         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
+            actual = query("segmentedControl marked:'#{control_id}'", {titleForSegmentAtIndex: counter}).first
             screenshot_and_raise "expected to see segment '#{expected}' at index '#{counter}' but found '#{actual}'"
           end
           counter = counter + 1

data/lib/briar/control/slider.rb

@@ -1,3 +1,5 @@
+require 'calabash-cucumber'
+
 module Briar
   module Control
     module Slider
@@ -18,11 +20,11 @@ module Briar
         args
       end
 
-      def briar_slider_set_value(slider_id, value,  options = {:animate => true,
-                                                         :notify_targets => true})
+      def briar_slider_set_value(slider_id, value, options = {:animate => true,
+                                                              :notify_targets => true})
         value_str = value.to_f.to_s
         args = briar_args_for_slider_set_value(options)
-        query_str =  "slider marked:'#{slider_id}'"
+        query_str = "slider marked:'#{slider_id}'"
         views_touched = map(query_str, :changeSlider, value_str, *args)
         if views_touched.empty? or views_touched.member? '<VOID>'
           screenshot_and_raise "could not slider marked '#{slider_id}' to '#{value}' using query '#{query_str}' with options '#{options}'"
@@ -32,7 +34,6 @@ module Briar
       end
 
 
-
       # WARNING: requires a tap gesture recognizer on the slider
       # you have been warned
       def change_slider_value_to(slider_id, value)

data/lib/briar/cucumber.rb

@@ -16,6 +16,7 @@ World(Briar::Picker::DateSteps)
 World(Briar::Email)
 World(Briar::ImageView)
 World(Briar::Keyboard)
+World(Briar::UIAKeyboard)
 World(Briar::Label)
 World(Briar::ScrollView)
 World(Briar::Table)

data/lib/briar/email.rb

@@ -9,7 +9,7 @@ module Briar
     end
 
     def email_not_testable?
-      not email_testable?()
+      not email_testable?
     end
 
     def warn_about_no_ios5_email_view
@@ -80,10 +80,6 @@ module Briar
       query("layoutContainerView descendant view:'MFMailComposeView'").count == 1
     end
 
-    def is_ios6_mail_view
-      warn 'WARN: deprecated 0.0.9'
-    end
-
     def should_see_mail_view (opts = {:timeout => BRIAR_WAIT_TIMEOUT,
                                       :email_view_mark => 'compose email'})
 
@@ -97,11 +93,12 @@ 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_RETRY_FREQ,
-               :post_timeout => BRIAR_POST_TIMEOUT,
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+               :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
         if dev.ios5?
           is_ios5_mail_view
@@ -136,6 +133,7 @@ module Briar
       # does a wait for iOS > 5 + uia available
       should_see_mail_view opts
 
+      #noinspection RubyParenthesesAfterMethodCallInspection
       device = device()
 
       if device.ios5?
@@ -157,8 +155,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 => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg) do
           uia_element_exists?(:view, marked: 'Cancel')
         end
@@ -166,8 +164,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 => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg) do
           uia_element_exists?(:view, marked: 'Delete Draft')
         end
@@ -178,5 +176,43 @@ module Briar
       end
       step_pause
     end
+
+    def uia_touch_email_to (opts={})
+      default_opts = {:await_keyboard => true}
+      opts = default_opts.merge(opts)
+
+      if uia_not_available?
+        screenshot_and_raise 'UIA needs to be available'
+      end
+
+      res = uia_query(:view, marked: 'To:').first
+      rect = res['rect']
+      point = {:x => rect['x'] + (2 * rect['width']),
+               :y => rect['y']}
+      uia_touch_with_options(point)
+      uia_await_keyboard if opts[:await_keyboard]
+    end
+
+    def uia_set_email_to(addresses, opts={})
+      default_opts = {:await_keyboard => true}
+      opts = default_opts.merge(opts)
+      uia_touch_email_to opts
+      addresses.each do |addr|
+        uia_type_string addr
+        uia_enter
+        step_pause
+      end
+    end
+
+    def uia_touch_send_email
+      uia_tap_mark('Send')
+    end
+
+    def uia_send_email_to(addresses, opts={})
+      default_opts = {:await_keyboard => true}
+      opts = default_opts.merge(opts)
+      uia_set_email_to addresses, opts
+      uia_touch_send_email
+    end
   end
 end

data/lib/briar/image_view.rb

@@ -23,8 +23,8 @@ module Briar
     def wait_for_image_view(iv_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see image view marked: '#{iv_id}'"
       options = {:timeout => timeout,
-                 :retry_frequency => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg}
       wait_for(options) do
         image_view_exists? iv_id
@@ -34,8 +34,8 @@ module Briar
     def wait_for_image_view_to_disappear(iv_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but i still see image view marked: '#{iv_id}'"
       options = {:timeout => timeout,
-                 :retry_frequency => BRIAR_RETRY_FREQ,
-                 :post_timeout => BRIAR_POST_TIMEOUT,
+                 :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+                 :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                  :timeout_message => msg}
       wait_for(options) do
         not image_view_exists? iv_id

data/lib/briar/{keyboard.rb → keyboard/keyboard.rb}

@@ -1,3 +1,5 @@
+require 'calabash-cucumber'
+
 module Briar
   module Keyboard
     # dismiss the keyboard on iPad
@@ -21,8 +23,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 => BRIAR_RETRY_FREQ,
-               :post_timeout => BRIAR_POST_TIMEOUT,
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+               :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
         element_exists('keyboardAutomatic')
       end
@@ -31,8 +33,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 => BRIAR_RETRY_FREQ,
-               :post_timeout => BRIAR_POST_TIMEOUT,
+               :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
+               :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
         element_does_not_exist 'keyboardAutomatic'
       end
@@ -47,7 +49,7 @@ module Briar
 
 
     # is it possible to find what view the keyboard is responding to?
-    def autocapitalization_type ()
+    def autocapitalization_type
       if !query('textView index:0').empty?
         query('textView index:0', :autocapitalizationType).first.to_i
       elsif !query('textField index:0').empty?
@@ -57,7 +59,7 @@ module Briar
       end
     end
 
-    def auto_correct_type()
+    def auto_correct_type
       if !query('textView index:0').empty?
         query('textView index:0', :autocorrectionType).first.to_i
       elsif !query('textField index:0').empty?
@@ -68,8 +70,9 @@ module Briar
     end
 
 
+    #noinspection RubyUnusedLocalVariable
     def briar_clear_text(view_id, timeout=5)
-      warn("deprecated 0.1.1 - will remove 'timeout' argument in a future release")
+      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
@@ -88,8 +91,9 @@ module Briar
 
     ### deprecated ###
 
+    #noinspection RubyUnusedLocalVariable
     def set_autocapitalization (type)
-      pending('deprecated 0.1.1 - does not work')
+      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?
@@ -100,12 +104,13 @@ module Briar
     end
 
     def turn_autocapitalization_off
-      pending('deprecated 0.1.1 - does not work')
+      deprecated('0.1.1', 'does not work', :pending)
       #set_autocapitalization UITextAutocapitalizationTypeNone
     end
 
+    #noinspection RubyUnusedLocalVariable
     def set_autocorrect (type)
-      pending('deprecated 0.1.1 - does not work')
+      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?
@@ -116,12 +121,12 @@ module Briar
     end
 
     def turn_autocorrect_off
-      pending('deprecated 0.1.1 - does not work')
+      deprecated('0.1.1', 'does not work', :pending)
       # set_autocorrect UITextAutocorrectionTypeNo
     end
 
     def turn_spell_correct_off
-      pending('deprecated 0.1.1 - does not work')
+      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?