@@ -168,8 +168,6 @@ ActiveRecord::Schema.define(:version => 75) do t.text "ping_urls" t.integer "articles_per_page", :default => 15 t.string "host" - t.string "akismet_key", :limit => 100 - t.string "akismet_url" t.boolean "approve_comments" t.integer "comment_age" t.string "timezone" @@ -179,6 +177,8 @@ ActiveRecord::Schema.define(:version => 75) do t.string "tag_path" t.string "tag_layout" t.string "current_theme_path" + t.string "akismet_key", :limit => 100 + t.string "akismet_url" end add_index "sites", ["host"], :name => "index_sites_on_host" db/schema.rb @@ -111,11 +111,11 @@ class ArticleTest < Test::Unit::TestCase def test_comment_expiration_date a = create_fake_article - assert_equal 5.days.from_now.utc.to_i, a.comments_expired_at.to_i + assert_equal((a.published_at + 10.days), a.comments_expired_at) end def test_comment_expiry - a = create_fake_article(5.days.from_now) + a = create_fake_article(5.days.from_now.utc) assert !a.accept_comments? a.published_at = 5.days.ago.utc assert a.accept_comments? @@ -174,7 +174,7 @@ class ArticleTest < Test::Unit::TestCase Article.create options.reverse_merge(:user_id => 1, :site_id => 1, :title => 'foo') end - def create_fake_article(time = 5.days.ago) + def create_fake_article(time = 5.days.ago.utc) returning Article.new(:comment_age => 10, :published_at => time.utc) do |a| def a.new_record?() false ; end end test/unit/article_test.rb c62b1a257ddecd3d6b72b9e77c914bb7e2358d65 rick technoweenie@gmail.com http://github.com/technoweenie/mephisto/commit/61c7122a62226b4d146656ed9f484c42d82eadb1 61c7122a62226b4d146656ed9f484c42d82eadb1 2008-03-10T23:50:03-07:00 2008-03-10T23:46:44-07:00 fix comment time comparison test bug bc9dafb073613f326c5358863ead5a1f1bcdf7fa rick technoweenie@gmail.com