fix dmail tests

This commit is contained in:
r888888888
2014-03-26 16:01:10 -07:00
parent 3c417392ad
commit 594b09b8c9
3 changed files with 19 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
class CurrentUser class CurrentUser
def self.scoped(user, ip_addr) def self.scoped(user, ip_addr = "127.0.0.1")
old_user = self.user old_user = self.user
old_ip_addr = self.ip_addr old_ip_addr = self.ip_addr

View File

@@ -1282,16 +1282,20 @@ class Post < ActiveRecord::Base
end end
def update_iqdb_async def update_iqdb_async
if Danbooru.config.iqdb_hostname_and_port
Danbooru.config.all_server_hosts.each do |host| Danbooru.config.all_server_hosts.each do |host|
delay(:queue => host).update_iqdb delay(:queue => host).update_iqdb
end end
end end
end
def remove_iqdb_async def remove_iqdb_async
if Danbooru.config.iqdb_hostname_and_port
Danbooru.config.all_server_hosts.each do |host| Danbooru.config.all_server_hosts.each do |host|
Post.delay(:queue => host).remove_iqdb(id) Post.delay(:queue => host).remove_iqdb(id)
end end
end end
end
def update_iqdb def update_iqdb
Iqdb::Server.new(*Danbooru.config.iqdb_hostname_and_port).add(self) Iqdb::Server.new(*Danbooru.config.iqdb_hostname_and_port).add(self)

View File

@@ -92,9 +92,16 @@ class DmailTest < ActiveSupport::TestCase
should "notify the recipient he has mail" do should "notify the recipient he has mail" do
dmail = FactoryGirl.create(:dmail, :owner => @user) dmail = FactoryGirl.create(:dmail, :owner => @user)
assert(dmail.to(true).has_mail?) recipient = dmail.to
recipient.reload
assert(recipient.has_mail?)
CurrentUser.scoped(recipient) do
dmail.mark_as_read! dmail.mark_as_read!
assert(!dmail.to(true).has_mail?) end
recipient.reload
assert(!recipient.has_mail?)
end end
end end
end end