Fix Article#published_at

That test was actually testing that published_at was equal to created_at by default, but what we actually want is to set published_at to the time of creation!

Fix Article#published_at
That test was actually testing that published_at was equal to created_at by default, but what we actually want is to set published_at to the time of creation!
Antonio Terceiro
1 parent 2716f355
Showing 2 changed files with 6 additions and 4 deletions Show diff stats
app/models/article.rb
test/unit/article_test.rb
@@ -34,7 +34,7 @@ class Article &lt; ActiveRecord::Base
   before_destroy :rotate_translations
   before_create do |article|
-    article.published_at = article.created_at if article.published_at.nil?
+    article.published_at ||= Time.now
     if article.reference_article && !article.parent
       parent = article.reference_article.parent
       if parent && parent.blog? && article.profile.has_blog?
@@ -707,9 +707,11 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_respond_to Article.new, :published_at
   end
-  should 'published_at is same as created_at if not set' do
-    a = fast_create(Article, :name => 'Published at', :profile_id => profile.id)
-    assert_equal a.created_at, a.published_at
+  should 'fill published_at with current date if not set' do
+    now = Time.now
+    Time.stubs(:now).returns(now)
+    a = create(Article, :name => 'Published at', :profile_id => profile.id)
+    assert_equal now, a.published_at
   end
   should 'use npage to compose cache key' do
	@@ -34,7 +34,7 @@ class Article < ActiveRecord::Base		@@ -34,7 +34,7 @@ class Article < ActiveRecord::Base
34	before_destroy :rotate_translations	34	before_destroy :rotate_translations
35		35
36	before_create do \|article\|	36	before_create do \|article\|
37	- article.published_at = article.created_at if article.published_at.nil?	37	+ article.published_at \|\|= Time.now
38	if article.reference_article && !article.parent	38	if article.reference_article && !article.parent
39	parent = article.reference_article.parent	39	parent = article.reference_article.parent
40	if parent && parent.blog? && article.profile.has_blog?	40	if parent && parent.blog? && article.profile.has_blog?