lib/briar/email.rb in briar-0.0.8 vs lib/briar/email.rb in briar-0.0.9

@@ -1,55 +1,64 @@
 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
       query("view:'MFComposeTextContentView'", :text)
     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
 
     def email_subject
       query("view:'MFComposeSubjectView'", :text).first
     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
 
     def email_to
       query("view:'_MFMailRecipientTextField'", :text).first
     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
 
     def email_to_contains? (address)
       addrs = email_to.split(/, ?/)
@@ -70,42 +79,91 @@
     def is_ios5_mail_view
       query("layoutContainerView descendant view:'MFMailComposeView'").count == 1
     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