Merge commit 'e6804db53297868da972db1b7153ec94a7c07c97' into v0.11.x

+ removing an uneeded require of mocha

Merge commit 'e6804db53297868da972db1b7153ec94a7c07c97' into v0.11.x
+ removing an uneeded require of mocha
Antonio Terceiro
2 parents 63d37eb0 e6804db5
Showing 2 changed files with 17 additions and 1 deletions Show diff stats
app/models/article.rb
test/unit/article_test.rb
@@ -86,7 +86,7 @@ class Article &lt; ActiveRecord::Base
                   'profiles.public_profile' => true
                 },
                 :include => 'profile',
-                :order => 'articles.created_at desc, articles.id desc'
+                :order => 'articles.updated_at desc, articles.id desc'
               }
     if ( scoped_methods && scoped_methods.last &&
          scoped_methods.last[:find] &&
@@ -169,6 +169,22 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_equal [ ], Article.recent(nil)
   end
+  should 'order recent articles by updated_at' do
+    p = create_user('usr1').person
+    Article.destroy_all
+
+    first  = p.articles.build(:name => 'first',  :public_article => true);  first.save!
+    second = p.articles.build(:name => 'second', :public_article => true, :updated_at => first.updated_at + 1.second); second.save!
+
+    assert_equal [ second, first ], Article.recent(2)
+
+    Article.record_timestamps = false
+    first.update_attributes!(:updated_at => second.updated_at + 1.second)
+    Article.record_timestamps = true
+
+    assert_equal [ first, second ], Article.recent(2)
+  end
+
   should 'require that subclasses define description' do
     assert_raise NotImplementedError do
       Article.description
	@@ -86,7 +86,7 @@ class Article < ActiveRecord::Base		@@ -86,7 +86,7 @@ class Article < ActiveRecord::Base
86	'profiles.public_profile' => true	86	'profiles.public_profile' => true
87	},	87	},
88	:include => 'profile',	88	:include => 'profile',
89	- :order => 'articles.created_at desc, articles.id desc'	89	+ :order => 'articles.updated_at desc, articles.id desc'
90	}	90	}
91	if ( scoped_methods && scoped_methods.last &&	91	if ( scoped_methods && scoped_methods.last &&
92	scoped_methods.last[:find] &&	92	scoped_methods.last[:find] &&
	@@ -169,6 +169,22 @@ class ArticleTest < Test::Unit::TestCase		@@ -169,6 +169,22 @@ class ArticleTest < Test::Unit::TestCase
169	assert_equal [ ], Article.recent(nil)	169	assert_equal [ ], Article.recent(nil)
170	end	170	end
171		171
		172	+ should 'order recent articles by updated_at' do
		173	+ p = create_user('usr1').person
		174	+ Article.destroy_all
		175	+
		176	+ first = p.articles.build(:name => 'first', :public_article => true); first.save!
		177	+ second = p.articles.build(:name => 'second', :public_article => true, :updated_at => first.updated_at + 1.second); second.save!
		178	+
		179	+ assert_equal [ second, first ], Article.recent(2)
		180	+
		181	+ Article.record_timestamps = false
		182	+ first.update_attributes!(:updated_at => second.updated_at + 1.second)
		183	+ Article.record_timestamps = true
		184	+
		185	+ assert_equal [ first, second ], Article.recent(2)
		186	+ end
		187	+
172	should 'require that subclasses define description' do	188	should 'require that subclasses define description' do
173	assert_raise NotImplementedError do	189	assert_raise NotImplementedError do
174	Article.description	190	Article.description