1 files changed, 30 insertions, 2 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 29469c42ed..54801bd101 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -143,6 +143,26 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal [Account], accounts.collect(&:class).uniq
   end
 
+  def test_take
+    assert_equal topics(:first), Topic.take
+  end
+
+  def test_take_failing
+    assert_nil Topic.where("title = 'This title does not exist'").take
+  end
+
+  def test_take_bang_present
+    assert_nothing_raised do
+      assert_equal topics(:second), Topic.where("title = 'The Second Topic of the day'").take!
+    end
+  end
+
+  def test_take_bang_missing
+    assert_raises ActiveRecord::RecordNotFound do
+      Topic.where("title = 'This title does not exist'").take!
+    end
+  end
+
   def test_first
     assert_equal topics(:second).title, Topic.where("title = 'The Second Topic of the day'").first.title
   end
@@ -163,6 +183,12 @@ class FinderTest < ActiveRecord::TestCase
     end
   end
 
+  def test_first_have_primary_key_order_by_default
+    expected = topics(:first)
+    expected.touch # PostgreSQL changes the default order if no order clause is used
+    assert_equal expected, Topic.first
+  end
+
   def test_model_class_responds_to_first_bang
     assert Topic.first!
     Topic.delete_all
@@ -191,7 +217,8 @@ class FinderTest < ActiveRecord::TestCase
     end
   end
 
-  def test_first_and_last_with_integer_should_use_sql_limit
+  def test_take_and_first_and_last_with_integer_should_use_sql_limit
+    assert_sql(/LIMIT 3|ROWNUM <= 3/) { Topic.take(3).entries }
     assert_sql(/LIMIT 2|ROWNUM <= 2/) { Topic.first(2).entries }
     assert_sql(/LIMIT 5|ROWNUM <= 5/) { Topic.last(5).entries }
   end
@@ -212,7 +239,8 @@ class FinderTest < ActiveRecord::TestCase
     assert_no_match(/LIMIT/, query.first)
   end
 
-  def test_first_and_last_with_integer_should_return_an_array
+  def test_take_and_first_and_last_with_integer_should_return_an_array
+    assert_kind_of Array, Topic.take(5)
     assert_kind_of Array, Topic.first(5)
     assert_kind_of Array, Topic.last(5)
   end