From 62c6ac2f8d423c62bffc18e06d90bb3b87a7c79a Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 18 May 2012 15:04:36 +0100
Subject: quarantine more deprecated stuff

---
 activerecord/test/cases/base_test.rb               | 18 -----------
 .../test/cases/deprecated_dynamic_methods_test.rb  | 36 ++++++++++++++++++++++
 activerecord/test/cases/finder_test.rb             |  9 ------
 activerecord/test/cases/relations_test.rb          |  9 ------
 4 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 66a16d8b5f..a7c1881561 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -168,24 +168,6 @@ class BasicsTest < ActiveRecord::TestCase
     assert Topic.table_exists?
   end
 
-  def test_finder_block
-    t = Topic.first
-    found = nil
-    Topic.find_by_id(t.id) { |f| found = f }
-    assert_equal t, found
-  end
-
-  def test_finder_block_nothing_found
-    bad_id = Topic.maximum(:id) + 1
-    assert_nil Topic.find_by_id(bad_id) { |f| raise }
-  end
-
-  def test_find_returns_block_value
-    t = Topic.first
-    x = Topic.find_by_id(t.id) { |f| "hi mom!" }
-    assert_equal "hi mom!", x
-  end
-
   def test_preserving_date_objects
     if current_adapter?(:SybaseAdapter)
       # Sybase ctlib does not (yet?) support the date type; use datetime instead.
diff --git a/activerecord/test/cases/deprecated_dynamic_methods_test.rb b/activerecord/test/cases/deprecated_dynamic_methods_test.rb
index f4ef974cda..77a609f49a 100644
--- a/activerecord/test/cases/deprecated_dynamic_methods_test.rb
+++ b/activerecord/test/cases/deprecated_dynamic_methods_test.rb
@@ -525,6 +525,42 @@ class DeprecatedDynamicMethodsTest < ActiveRecord::TestCase
 
     assert_equal authors(:david), authors.find_or_create_by_name!(:name => 'David')
   end
+
+  def test_finder_block
+    t = Topic.first
+    found = nil
+    Topic.find_by_id(t.id) { |f| found = f }
+    assert_equal t, found
+  end
+
+  def test_finder_block_nothing_found
+    bad_id = Topic.maximum(:id) + 1
+    assert_nil Topic.find_by_id(bad_id) { |f| raise }
+  end
+
+  def test_find_returns_block_value
+    t = Topic.first
+    x = Topic.find_by_id(t.id) { |f| "hi mom!" }
+    assert_equal "hi mom!", x
+  end
+
+  def test_dynamic_finder_with_invalid_params
+    assert_raise(ArgumentError) { Topic.find_by_title 'No Title', :join => "It should be `joins'" }
+  end
+
+  def test_find_by_one_attribute_with_order_option
+    assert_equal accounts(:signals37), Account.find_by_credit_limit(50, :order => 'id')
+    assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :order => 'id DESC')
+  end
+
+  def test_dynamic_find_by_attributes_should_yield_found_object
+    david = authors(:david)
+    yielded_value = nil
+    Author.find_by_name(david.name) do |author|
+      yielded_value = author
+    end
+    assert_equal david, yielded_value
+  end
 end
 
 class DynamicScopeTest < ActiveRecord::TestCase
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 04d873a14d..f7ecab28ce 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -589,11 +589,6 @@ class FinderTest < ActiveRecord::TestCase
     assert_raise(ActiveRecord::RecordNotFound) { Topic.find_by_title!("The First Topic!") }
   end
 
-  def test_find_by_one_attribute_with_order_option
-    assert_equal accounts(:signals37), Account.find_by_credit_limit(50, :order => 'id')
-    assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :order => 'id DESC')
-  end
-
   def test_find_by_one_attribute_with_conditions
     assert_equal accounts(:rails_core_account), Account.where('firm_id = ?', 6).find_by_credit_limit(50)
   end
@@ -678,10 +673,6 @@ class FinderTest < ActiveRecord::TestCase
     assert_raise(ActiveRecord::StatementInvalid) { Topic.find_by_sql "select 1 from badtable" }
   end
 
-  def test_dynamic_finder_with_invalid_params
-    assert_raise(ArgumentError) { Topic.find_by_title 'No Title', :join => "It should be `joins'" }
-  end
-
   def test_find_all_with_join
     developers_on_project_one = Developer.scoped(
       :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id',
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 81678761b8..4a56ae0d23 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -443,15 +443,6 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal Post.find(1).last_comment, post.last_comment
   end
 
-  def test_dynamic_find_by_attributes_should_yield_found_object
-    david = authors(:david)
-    yielded_value = nil
-    Author.find_by_name(david.name) do |author|
-      yielded_value = author
-    end
-    assert_equal david, yielded_value
-  end
-
   def test_dynamic_find_by_attributes
     david = authors(:david)
     author = Author.preload(:taggings).find_by_id(david.id)
-- 
cgit v1.2.3