briar 0.0.8 → 0.0.9

data/lib/briar/bars/navbar.rb

@@ -23,8 +23,13 @@ module Briar
     end
 
     def should_see_navbar_back_button
-      unless navbar_has_back_button?
-        screenshot_and_raise 'there is no navigation bar back button'
+      timeout = BRIAR_WAIT_TIMEOUT * 2.0
+      msg = "waited for '#{timeout}' seconds but did not see navbar back button"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg) do
+        navbar_has_back_button?
       end
     end
 
@@ -41,17 +46,43 @@ module Briar
       titles.index(name)
     end
 
-    def should_see_navbar_button (name)
-      idx = index_of_navbar_button name
-      if idx.nil?
-        screenshot_and_raise "there should be a navbar button named '#{name}'"
+    def should_see_navbar_button (name, is_ui_button=false)
+      if is_ui_button
+        qstr = "button marked:'#{name}' parent navigationBar"
+        timeout = BRIAR_WAIT_TIMEOUT
+        msg = "waited for '#{timeout}' seconds but did not see '#{name}' in navigation bar"
+        wait_for(:timeout => timeout,
+                 :retry_frequency => 0.2,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg) do
+          element_exists qstr
+        end
+      else
+        idx = index_of_navbar_button name
+        if idx.nil?
+          # check to see if it is a ui button
+          should_see_navbar_button(name, true)
+        end
       end
     end
 
-    def should_not_see_navbar_button (name)
-      idx = index_of_navbar_button name
-      unless idx.nil?
-        screenshot_and_raise "i should not see a navbar button named #{name}"
+
+    def should_not_see_navbar_button (name, is_ui_button=false)
+      if is_ui_button
+        qstr = "button marked:'#{name}' parent navigationBar"
+        timeout = 1.0
+        msg = "waited for '#{timeout}' seconds but i still see '#{name}' in navigation bar"
+        wait_for(:timeout => timeout,
+                 :retry_frequency => 0.2,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg) do
+          element_does_not_exist qstr
+        end
+      else
+        idx = index_of_navbar_button name
+        unless idx.nil?
+          screenshot_and_raise "i should not see a navbar button named #{name}"
+        end
       end
     end
 
@@ -82,8 +113,8 @@ module Briar
 
       touch_transition('navigationItemButtonView first',
                        "view marked:'#{view}'",
-                       {:timeout=>TOUCH_TRANSITION_TIMEOUT,
-                        :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+                       {:timeout => TOUCH_TRANSITION_TIMEOUT,
+                        :retry_frequency => TOUCH_TRANSITION_RETRY_FREQ})
       step_pause
     end
 
@@ -113,15 +144,20 @@ module Briar
       touch_navbar_item item_name, view_id
     end
 
-
     def navbar_has_title? (title)
-      sleep(0.2)
-      query('navigationItemView', AL).include?(title)
-    end
-
-    def should_see_navbar_with_title(title)
-      unless navbar_has_title? title
-        screenshot_and_raise "after waiting, i did not see navbar with title #{title}"
+      all_items = query("navigationItemView marked:'#{title}'")
+      button_items = query('navigationItemButtonView')
+      non_button_items = all_items.delete_if { |item| button_items.include?(item) }
+      !non_button_items.empty?
+    end
+
+    def should_see_navbar_with_title(title, timeout=BRIAR_WAIT_TIMEOUT)
+      msg = "waited for '#{timeout}' seconds but i did not see #{title} in navbar"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg) do
+        navbar_has_title? title
       end
     end
 

data/lib/briar/briar_core.rb

@@ -1,6 +1,5 @@
 require 'calabash-cucumber'
 
-
 module Briar
   module Core
 
@@ -12,6 +11,13 @@ module Briar
       sleep(ANIMATION_PAUSE)
     end
 
+    def uia_not_available
+      env('NO_LAUNCH') == '1'
+    end
+
+    def uia_available
+      not uia_not_available
+    end
 
     def view_exists? (view_id)
       !query("view marked:'#{view_id}'").empty?
@@ -33,6 +39,31 @@ module Briar
       element_exists("view text:'#{text}'")
     end
 
+    def should_see_view_with_frame(view_id, frame)
+      res = query("view marked:'#{view_id}'").first
+      if res.empty?
+        screenshot_and_raise "should see view with id '#{view_id}'"
+      end
+      actual = res['frame']
+      ['x', 'y', 'width', 'height'].each { |key|
+        avalue = actual[key]
+        evalue = frame[key]
+        screenshot_and_raise "#{view_id} should have '#{key}' '#{evalue}' but found '#{avalue}'"
+      }
+    end
+
+    def should_see_view_with_center(view_id, center_ht)
+      res = query("view marked:'#{view_id}'").first
+      if res.nil?
+        screenshot_and_raise "should see view with id '#{view_id}'"
+      end
+
+      actual_ht = {x: res['rect']['center_x'], y: res['rect']['center_y']}
+
+      unless actual_ht == center_ht
+        screenshot_and_raise "#{view_id} has center '#{actual_ht}' but should have center '#{center_ht}'"
+      end
+    end
 
     def should_see_view_after_animation (view_id)
       pending "WARN: deprecated 0.0.8 - use 'wait_for_view #{view_id}' instead"
@@ -51,25 +82,59 @@ module Briar
     end
 
     def touch_view_named(view_id)
+      wait_for_view view_id
       touch("view marked:'#{view_id}'")
     end
 
-    def touch_and_wait_for_view(view_id, view_to_wait_for, timeout=1.0)
+    def touch_and_wait_for_view(view_id, view_to_wait_for, timeout=BRIAR_WAIT_TIMEOUT)
       touch_view_named(view_id)
       wait_for_view(view_to_wait_for, timeout)
     end
 
-    def wait_for_view (view_id, timeout=1.0)
+    def wait_for_view (view_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see '#{view_id}'"
       wait_for(:timeout => timeout,
                :retry_frequency => 0.2,
                :post_timeout => 0.1,
-               :timeout_message => msg ) do
+               :timeout_message => msg) do
         view_exists? view_id
       end
     end
 
-    def wait_for_views(views, timeout=1.0)
+    def wait_for_query(qstr, timeout=BRIAR_WAIT_TIMEOUT)
+      msg = "waited for '#{timeout}' seconds but did not see\n '#{qstr}'"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg) do
+        !query(qstr).empty?
+      end
+    end
+
+    def wait_for_custom_view (view_class, view_id, timeout=BRIAR_WAIT_TIMEOUT)
+      msg = "waited for '#{timeout}' seconds but did not see '#{view_id}'"
+      wait_for(:timeout => timeout,
+               :retry_frequency => 0.2,
+               :post_timeout => 0.1,
+               :timeout_message => msg) do
+        !query("view:'#{view_class}' marked:'#{view_id}'").empty?
+      end
+    end
+
+    def touch_custom_view(view_class, view_id, timeout=BRIAR_WAIT_TIMEOUT)
+      wait_for_custom_view view_class, view_id, timeout
+      touch("view:'#{view_class}' marked:'#{view_id}'")
+    end
+
+
+    def touch_custom_view_and_wait_for_view(view_class, view_id, view_to_wait_for, timeout=BRIAR_WAIT_TIMEOUT)
+      wait_for_custom_view view_class, view_id, timeout
+      touch("view:'#{view_class}' marked:'#{view_id}'")
+      wait_for_view view_to_wait_for, timeout
+    end
+
+
+    def wait_for_views(views, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds but did not see '#{views}'"
       options = {:timeout => timeout,
                  :retry_frequency => 0.2,
@@ -80,7 +145,7 @@ module Briar
       end
     end
 
-    def wait_for_view_to_disappear(view_id, timeout=1.0)
+    def wait_for_view_to_disappear(view_id, timeout=BRIAR_WAIT_TIMEOUT)
       msg = "waited for '#{timeout}' seconds for '#{view_id}' to disappear but it is still visible"
       options = {:timeout => timeout,
                  :retry_frequency => 0.2,
@@ -91,12 +156,12 @@ module Briar
       end
     end
 
-
-    def touch_and_wait_to_disappear(view_id, timeout=1.0)
+    def touch_and_wait_to_disappear(view_id, timeout=BRIAR_WAIT_TIMEOUT)
       touch_view_named(view_id)
       wait_for_view_to_disappear view_id, timeout
     end
-    
+
+
     # backdoor helpers
     # canonical backdoor command: 'calabash_backdoor_handle_command'
     # selector key = :selector
@@ -111,6 +176,12 @@ module Briar
       json = "{\":selector\" : \"#{command}\", \":args\" : #{array}}"
       backdoor('calabash_backdoor_handle_command:', json)
     end
+
+    def tokenize_list (list)
+      tokens = list.split(/[,]|(and )/)
+      stripped = tokens.map { |elm| elm.strip }
+      stripped.delete_if { |elm| ['and', 'or', ''].include?(elm) }
+    end
   end
 end
 

data/lib/briar/control/button.rb

@@ -4,8 +4,8 @@ module Briar
   module Control
     module Button
       include Briar::Core
-      def button_exists? (name)
-        res = query("button marked:'#{name}'", :alpha)
+      def button_exists? (button_id)
+        res = query("button marked:'#{button_id}'", :alpha)
         if res.empty?
           false
         else
@@ -13,10 +13,8 @@ module Briar
         end
       end
 
-      def should_see_button (name)
-        unless button_exists? name
-          screenshot_and_raise "i did not see a button with marked #{name}"
-        end
+      def should_see_button (button_id)
+        wait_for_button button_id
       end
 
       def should_not_see_button (button_id)
@@ -30,31 +28,30 @@ module Briar
 
       def should_see_button_with_title(name, title)
         should_see_button name
-        if query("button marked:'#{title}' child label", :text).empty?
-          screenshot_and_raise "i do not see a button marked #{name} with title #{title}"
+        if query("button marked:'#{name}' child label", :text).empty?
+          screenshot_and_raise "i do not see a button marked '#{name}' with title '#{title}'"
         end
       end
 
-      def touch_button (name)
-        should_see_button name
-        touch("button marked:'#{name}'")
-        step_pause
+      def touch_button (button_id)
+        should_see_button button_id
+        touch("button marked:'#{button_id}'")
       end
 
       def touch_button_and_wait_for_view (button_id, view_id)
-        touch_transition("button marked:'#{button_id}'",
-                         "view marked:'#{view_id}'",
-                         {:timeout=>TOUCH_TRANSITION_TIMEOUT,
-                          :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+        touch_button(button_id)
+        unless view_id.nil?
+          wait_for_view view_id
+        end
       end
 
-      def touch_button_and_wait_for_view_to_disappear (button_id, view_id, timeout=1.0)
+      def touch_button_and_wait_for_view_to_disappear (button_id, view_id, timeout=BRIAR_WAIT_TIMEOUT)
         touch_button button_id
         wait_for_view_to_disappear view_id, timeout
       end
 
 
-      def wait_for_button (button_id, timeout=1.0)
+      def wait_for_button (button_id, timeout=BRIAR_WAIT_TIMEOUT)
         msg = "waited for '#{timeout}' seconds but did not see button '#{button_id}'"
         wait_for(:timeout => timeout,
                  :retry_frequency => 0.2,
@@ -64,7 +61,7 @@ module Briar
         end
       end
 
-      def wait_for_button_with_title (button_id, title, timeout=1.0)
+      def wait_for_button_with_title (button_id, title, timeout=BRIAR_WAIT_TIMEOUT)
         msg = "waited for '#{timeout}' seconds but did not see button '#{button_id}' with title '#{title}'"
         wait_for(:timeout => timeout,
                  :retry_frequency => 0.2,

data/lib/briar/email.rb

@@ -3,8 +3,17 @@ require 'calabash-cucumber'
 module Briar
   module Email
 
-    def warn_about_ios6_email_view
-      warn 'WARN: iOS6 detected - cannot test for email views on iOS simulator or devices'
+    def email_testable?
+      return true if device.ios5?
+      uia_available?
+    end
+
+    def email_not_testable?
+      not email_testable?()
+    end
+
+    def warn_about_no_ios5_email_view
+      warn 'WARN: iOS > 5 detected - cannot test for email views on iOS simulator or devices unless we use UIAutomation'
     end
 
     def email_body
@@ -12,10 +21,10 @@ module Briar
     end
 
     def email_body_contains? (text)
-      if device.ios6?
-        warn 'WARN: iOS6 detected - cannot test for email body text https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
-      else
+      if device.ios5?
         !query("view:'MFComposeTextContentView' {text LIKE '*#{text}*'}").empty?
+      else
+        warn 'WARN: iOS > 5 detected - cannot test for email body text'
       end
     end
 
@@ -24,18 +33,18 @@ module Briar
     end
 
     def email_subject_is? (text)
-      if device.ios6?
-        warn 'WARN: iOS6 detected - cannot test for email subject text https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
-      else
+      if device.ios5?
         email_subject.eql? text
+      else
+        warn 'WARN: iOS > 5 detected - cannot test for email subject text'
       end
     end
 
     def email_subject_has_text_like? (text)
-      if device.ios6?
-        warn 'WARN: iOS6 detected - cannot test for email subject text https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
-      else
+      if device.ios5?
         !query("view:'MFComposeSubjectView' {text LIKE '*#{text}*'}").empty?
+      else
+        warn 'WARN: iOS > 5 detected - cannot test for email subject text'
       end
     end
 
@@ -44,10 +53,10 @@ module Briar
     end
 
     def email_to_field_is? (text)
-      if device.ios6?
-        warn 'WARN: iOS6 detected - cannot test for email to field https://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
-      else
+      if device.ios5?
         email_to.eql? text
+      else
+        warn 'WARN: iOS > 5 detected - cannot test for email to field'
       end
     end
 
@@ -72,40 +81,89 @@ module Briar
     end
 
     def is_ios6_mail_view
-      device.ios6?
+      warn 'WARN: deprected 0.0.9'
     end
 
-    def should_see_mail_view (timeout=1.0)
-      if device.ios6?
-        screenshot_and_raise 'iOS6 detected - cannot test for email viewhttps://groups.google.com/d/topic/calabash-ios/Ff3XFsjp-B0/discussion'
+    def should_see_mail_view (timeout=BRIAR_WAIT_TIMEOUT)
+      if email_not_testable?
+        warn_about_no_ios5_email_view
+        return
       end
 
       msg = "waited for '#{timeout}' seconds but did not see email compose view"
+      dev = device()
       wait_for(:timeout => timeout,
                :retry_frequency => 0.2,
                :post_timeout => 0.1,
-               :timeout_message => msg ) do
-        is_ios5_mail_view
+               :timeout_message => msg) do
+        if dev.ios5?
+          is_ios5_mail_view
+        else
+          view_exists? 'compose email'
+        end
       end
     end
 
+    #noinspection RubyResolve
     def device_can_send_email
       return true if device.simulator?
-      backdoor('calabash_backdoor_configured_for_mail:', 'ignorable').eql? 'YES'
+      if defined? backdoor_device_configured_for_mail?
+        backdoor_device_configured_for_mail?
+      else
+        pending 'you will need to create a backdoor method to check if the device can send an email'
+      end
     end
 
     def delete_draft_and_wait_for (view_id)
-      if device.ios6?
-        warn_about_ios6_email_view
+      if email_not_testable?
+        warn_about_no_ios5_email_view
+        return
+      end
+
+      # does a wait for iOS > 5 + uia available
+      should_see_mail_view
+
+      device = device()
+
+      if device.ios5?
+        touch_navbar_item_and_wait_for_view 'Cancel', 'Delete Draft'
+        step_pause
+        touch_sheet_button_and_wait_for_view 'Delete Draft', view_id
       else
-        should_see_mail_view
-        touch_navbar_item 'Cancel'
-        wait_for_animation
-        touch_transition("button marked:'Delete Draft'",
-                         "view marked:'#{view_id}'",
-                         {:timeout=>TOUCH_TRANSITION_TIMEOUT,
-                          :retry_frequency=>TOUCH_TRANSITION_RETRY_FREQ})
+        sbo = status_bar_orientation.to_sym
+
+        if sbo.eql?(:left) or sbo.eql?(:right)
+          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"
+        end
+
+        timeout = BRIAR_WAIT_TIMEOUT * 2
+        msg = "waited for '#{timeout}' seconds but did not see cancel button"
+        wait_for(:timeout => timeout,
+                 :retry_frequency => 1.1,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg) do
+          uia_element_exists?(:view, marked: 'Cancel')
+        end
+
+        uia_tap_mark('Cancel')
+        msg = "waited for '#{timeout}' seconds but did not see dismiss email action sheet"
+        wait_for(:timeout => timeout,
+                 :retry_frequency => 1.1,
+                 :post_timeout => 0.1,
+                 :timeout_message => msg) do
+          uia_element_exists?(:view, marked: 'Delete Draft')
+        end
+
+        uia_tap_mark('Delete Draft')
+
+        wait_for_view_to_disappear 'compose email'
       end
+      step_pause
     end
   end
 end