test/mailers/confirmation_instructions_test.rb in devise-1.1.pre4 vs test/mailers/confirmation_instructions_test.rb in devise-1.1.rc0

@@ -1,6 +1,6 @@
-require 'test/test_helper'
+require 'test_helper'
 
 class ConfirmationInstructionsTest < ActionMailer::TestCase
 
   def setup
     setup_mailer
@@ -21,11 +21,11 @@
   test 'email sent after creating the user' do
     assert_not_nil mail
   end
 
   test 'content type should be set to html' do
-    assert_equal 'text/html', mail.content_type
+    assert mail.content_type.include?('text/html')
   end
 
   test 'send confirmation instructions to the user email' do
     mail
     assert_equal [user.email], mail.to
@@ -46,17 +46,17 @@
       assert_equal 'User Account Confirmation', mail.subject
     end
   end
 
   test 'body should have user info' do
-    assert_match /#{user.email}/, mail.body
+    assert_match /#{user.email}/, mail.body.encoded
   end
 
   test 'body should have link to confirm the account' do
     host = ActionMailer::Base.default_url_options[:host]
     confirmation_url_regexp = %r{<a href=\"http://#{host}/users/confirmation\?confirmation_token=#{user.confirmation_token}">}
-    assert_match confirmation_url_regexp, mail.body
+    assert_match confirmation_url_regexp, mail.body.encoded
   end
 
   test 'renders a scoped if scoped_views is set to true' do
     swap Devise, :scoped_views => true do
       assert_equal user.email, mail.body.decoded
@@ -71,10 +71,10 @@
       Devise::Mailer.send :remove_instance_variable, :@scoped_views
     end
   end
 
   test 'mailer sender accepts a proc' do
-    swap Devise, :mailer_sender => lambda { "[e-mail]" } do
+    swap Devise, :mailer_sender => proc { "[e-mail]" } do
       assert_equal ['[e-mail]'], mail.from
     end
   end
 end