aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-01-27 19:08:36 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-01-27 19:08:36 -0800
commit187b3b0b4808c2daf015699dfa1e5a78605072a7 (patch)
tree5faa2b2aa42b6f5a214b7d2c6cc255a8fdefc403 /actionmailer
parent8c60acbea22645278bb43a4fa575b298cea7671a (diff)
downloadrails-187b3b0b4808c2daf015699dfa1e5a78605072a7.tar.gz
rails-187b3b0b4808c2daf015699dfa1e5a78605072a7.tar.bz2
rails-187b3b0b4808c2daf015699dfa1e5a78605072a7.zip
Fix time comparison. Mail#date returns DateTime not Time.
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/base_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 9e1a4c22c6..86db3afc15 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -100,7 +100,7 @@ class BaseTest < ActiveSupport::TestCase
end
test "mail() with bcc, cc, content_type, charset, mime_version, reply_to and date" do
- @time = Time.now
+ @time = Time.now.beginning_of_day.to_datetime
email = BaseMailer.welcome(:bcc => 'bcc@test.lindsaar.net',
:cc => 'cc@test.lindsaar.net',
:content_type => 'multipart/mixed',