lib/briar/email.rb in briar-0.1.4.b1 vs lib/briar/email.rb in briar-0.1.4.b2

@@ -80,23 +80,23 @@
       query("layoutContainerView descendant view:'MFMailComposeView'").count == 1
     end
 
     def should_see_mail_view (opts = {:timeout => BRIAR_WAIT_TIMEOUT,
                                       :email_view_mark => 'compose email'})
+      default_opts = {:timeout => BRIAR_WAIT_TIMEOUT,
+                      :email_view_mark => 'compose email'}
+      merged = default_opts.merge(opts)
 
-      {:timeout => BRIAR_WAIT_TIMEOUT, :email_view_mark => 'compose email'}.merge!(opts)
-
-
       if email_not_testable?
         warn_about_no_ios5_email_view
         return
       end
 
-      timeout = opts[:timeout]
+      timeout = merged[:timeout]
       msg = "waited for '#{timeout}' seconds but did not see email compose view"
       #noinspection RubyParenthesesAfterMethodCallInspection
 
-      email_view_mark = opts[:email_view_mark]
+      email_view_mark = merged[:email_view_mark]
       wait_for(:timeout => timeout,
                :retry_frequency => BRIAR_WAIT_RETRY_FREQ,
                :post_timeout => BRIAR_WAIT_STEP_PAUSE,
                :timeout_message => msg) do
         if ios5?