fix tests

app/models/dmail.rb

@@ -181,7 +181,7 @@ class Dmail < ActiveRecord::Base
 
   def send_dmail
     if to.receive_email_notifications? && to.email.include?("@") && owner_id == to.id
-      UserMailer.dmail_notice(self).deliver
+      UserMailer.dmail_notice(self).deliver_now
     end
   end
 

app/models/forum_subscription.rb

@@ -14,7 +14,7 @@ class ForumSubscription < ActiveRecord::Base
         CurrentUser.scoped(subscription.user, "127.0.0.1") do
           forum_posts = forum_topic.posts.where("created_at > ?", subscription.last_read_at).order("id desc")
           begin
-            UserMailer.forum_notice(subscription.user, forum_topic, forum_posts).deliver
+            UserMailer.forum_notice(subscription.user, forum_topic, forum_posts).deliver_now
           rescue Net::SMTPSyntaxError
           end
           subscription.update_attribute(:last_read_at, forum_topic.updated_at)

app/models/note.rb

@@ -9,7 +9,7 @@ class Note < ActiveRecord::Base
   before_validation :blank_body
   validates_presence_of :post_id, :creator_id, :updater_id, :x, :y, :width, :height
   validate :post_must_exist
-  validate :note_within_image, :message => "must be inside the image"
+  validate :note_within_image
   after_save :update_post
   after_save :create_version
   validate :post_must_not_be_note_locked

app/models/user.rb

@@ -188,7 +188,7 @@ class User < ActiveRecord::Base
 
     def reset_password_and_deliver_notice
       new_password = reset_password()
-      Maintenance::User::PasswordResetMailer.confirmation(self, new_password).deliver
+      Maintenance::User::PasswordResetMailer.confirmation(self, new_password).deliver_now
     end
   end
 

app/models/user_password_reset_nonce.rb

@@ -10,7 +10,7 @@ class UserPasswordResetNonce < ActiveRecord::Base
   end
 
   def deliver_notice
-    Maintenance::User::PasswordResetMailer.reset_request(user, self).deliver
+    Maintenance::User::PasswordResetMailer.reset_request(user, self).deliver_now
   end
 
   def initialize_key