6 files changed, 18 insertions, 47 deletions
diff --git a/activerecord/test/models/car.rb b/activerecord/test/models/car.rb
index 42ac81690f..b4bc0ad5fa 100644
--- a/activerecord/test/models/car.rb
+++ b/activerecord/test/models/car.rb
@@ -15,7 +15,6 @@ class Car < ActiveRecord::Base
   scope :incl_engines, -> { includes(:engines) }
 
   scope :order_using_new_style,  -> { order('name asc') }
-  scope :order_using_old_style,  -> { { :order => 'name asc' } }
 
 end
 
diff --git a/activerecord/test/models/comment.rb b/activerecord/test/models/comment.rb
index 00f5a74070..3e9f1b0635 100644
--- a/activerecord/test/models/comment.rb
+++ b/activerecord/test/models/comment.rb
@@ -9,6 +9,8 @@ class Comment < ActiveRecord::Base
   belongs_to :post, :counter_cache => true
   has_many :ratings
 
+  belongs_to :first_post, :foreign_key => :post_id
+
   has_many :children, :class_name => 'Comment', :foreign_key => :parent_id
   belongs_to :parent, :class_name => 'Comment', :counter_cache => :children_count
 
@@ -17,7 +19,7 @@ class Comment < ActiveRecord::Base
   end
 
   def self.search_by_type(q)
-    self.find(:all, :conditions => ["#{QUOTED_TYPE} = ?", q])
+    self.scoped(:where => ["#{QUOTED_TYPE} = ?", q]).all
   end
 
   def self.all_as_method
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb
index fbdfaa2c29..7b993d5a2c 100644
--- a/activerecord/test/models/company.rb
+++ b/activerecord/test/models/company.rb
@@ -198,6 +198,11 @@ class Account < ActiveRecord::Base
     @destroyed_account_ids ||= Hash.new { |h,k| h[k] = [] }
   end
 
+  # Test private kernel method through collection proxy using has_many.
+  def self.open
+    where('firm_name = ?', '37signals')
+  end
+
   before_destroy do |account|
     if account.firm
       Account.destroyed_account_ids[account.firm.id] << account.id
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 4cc4947e3b..83482f4d07 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -2,20 +2,20 @@ require 'ostruct'
 
 module DeveloperProjectsAssociationExtension
   def find_most_recent
-    find(:first, :order => "id DESC")
+    scoped(:order => "id DESC").first
   end
 end
 
 module DeveloperProjectsAssociationExtension2
   def find_least_recent
-    find(:first, :order => "id ASC")
+    scoped(:order => "id ASC").first
   end
 end
 
 class Developer < ActiveRecord::Base
   has_and_belongs_to_many :projects do
     def find_most_recent
-      find(:first, :order => "id DESC")
+      scoped(:order => "id DESC").first
     end
   end
 
@@ -37,7 +37,7 @@ class Developer < ActiveRecord::Base
       :association_foreign_key => "project_id",
       :extend => DeveloperProjectsAssociationExtension do
         def find_least_recent
-          find(:first, :order => "id ASC")
+          scoped(:order => "id ASC").first
         end
       end
 
@@ -57,12 +57,6 @@ class Developer < ActiveRecord::Base
   def log=(message)
     audit_logs.build :message => message
   end
-
-  def self.all_johns
-    self.with_exclusive_scope :find => where(:name => 'John') do
-      self.all
-    end
-  end
 end
 
 class AuditLog < ActiveRecord::Base
@@ -102,12 +96,6 @@ class DeveloperOrderedBySalary < ActiveRecord::Base
   default_scope { order('salary DESC') }
 
   scope :by_name, -> { order('name DESC') }
-
-  def self.all_ordered_by_name
-    with_scope(:find => { :order => 'name DESC' }) do
-      find(:all)
-    end
-  end
 end
 
 class DeveloperCalledDavid < ActiveRecord::Base
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 5002ab9ff8..1aaf9a1b82 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -9,11 +9,6 @@ class Post < ActiveRecord::Base
   scope :ranked_by_comments,      -> { order("comments_count DESC") }
 
   scope :limit_by, lambda {|l| limit(l) }
-  scope :with_authors_at_address, lambda { |address| {
-      :conditions => [ 'authors.author_address_id = ?', address.id ],
-      :joins => 'JOIN authors ON authors.id = posts.author_id'
-    }
-  }
 
   belongs_to :author do
     def greeting
@@ -32,13 +27,11 @@ class Post < ActiveRecord::Base
 
   scope :with_special_comments, -> { joins(:comments).where(:comments => {:type => 'SpecialComment'}) }
   scope :with_very_special_comments, -> { joins(:comments).where(:comments => {:type => 'VerySpecialComment'}) }
-  scope :with_post, lambda {|post_id|
-    { :joins => :comments, :conditions => {:comments => {:post_id => post_id} } }
-  }
+  scope :with_post, ->(post_id) { joins(:comments).where(:comments => { :post_id => post_id }) }
 
   has_many   :comments do
     def find_most_recent
-      find(:first, :order => "id DESC")
+      scoped(:order => "id DESC").first
     end
 
     def newest
@@ -71,8 +64,8 @@ class Post < ActiveRecord::Base
   has_many :taggings, :as => :taggable
   has_many :tags, :through => :taggings do
     def add_joins_and_select
-      find :all, :select => 'tags.*, authors.id as author_id',
-        :joins => 'left outer join posts on taggings.taggable_id = posts.id left outer join authors on posts.author_id = authors.id'
+      scoped(:select => 'tags.*, authors.id as author_id',
+        :joins => 'left outer join posts on taggings.taggable_id = posts.id left outer join authors on posts.author_id = authors.id').all
     end
   end
 
diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index 785839be75..079e403444 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -2,7 +2,7 @@ class Topic < ActiveRecord::Base
   scope :base, -> { scoped }
   scope :written_before, lambda { |time|
     if time
-      { :conditions => ['written_on < ?', time] }
+      where 'written_on < ?', time
     end
   }
   scope :approved, -> { where(:approved => true) }
@@ -11,11 +11,7 @@ class Topic < ActiveRecord::Base
   scope :scope_with_lambda, lambda { scoped }
 
   scope :by_lifo, -> { where(:author_name => 'lifo') }
-
-  ActiveSupport::Deprecation.silence do
-    scope :approved_as_hash_condition, :conditions => {:topics => {:approved => true}}
-    scope :replied, :conditions => ['replies_count > 0']
-  end
+  scope :replied, -> { where 'replies_count > 0' }
 
   scope 'approved_as_string', -> { where(:approved => true) }
   scope :anonymous_extension, -> { scoped } do
@@ -35,18 +31,6 @@ class Topic < ActiveRecord::Base
       2
     end
   end
-  module MultipleExtensionOne
-    def extension_one
-      1
-    end
-  end
-  module MultipleExtensionTwo
-    def extension_two
-      2
-    end
-  end
-  scope :named_extension, -> { { :extend => NamedExtension } }
-  scope :multiple_extensions, -> { { :extend => [MultipleExtensionTwo, MultipleExtensionOne] } }
 
   has_many :replies, :dependent => :destroy, :foreign_key => "parent_id"
   has_many :replies_with_primary_key, :class_name => "Reply", :dependent => :destroy, :primary_key => "title", :foreign_key => "parent_title"