remove deprecated scope stuff

5 files changed, 2 insertions, 54 deletions

diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 3a927aeddd..c17c2a126a 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -98,25 +98,6 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal all_topics, Topic.written_before(nil)
   end
 
-  def test_scopes_with_joins
-    address = author_addresses(:david_address)
-    posts_with_authors_at_address = Post.find(
-      :all, :joins => 'JOIN authors ON authors.id = posts.author_id',
-      :conditions => [ 'authors.author_address_id = ?', address.id ]
-    )
-    assert_equal posts_with_authors_at_address, Post.with_authors_at_address(address)
-  end
-
-  def test_scopes_with_joins_respects_custom_select
-    address = author_addresses(:david_address)
-    posts_with_authors_at_address_titles = Post.find(:all,
-      :select => 'title',
-      :joins => 'JOIN authors ON authors.id = posts.author_id',
-      :conditions => [ 'authors.author_address_id = ?', address.id ]
-    )
-    assert_equal posts_with_authors_at_address_titles.map(&:title), Post.with_authors_at_address(address).find(:all, :select => 'title').map(&:title)
-  end
-
   def test_scope_with_object
     objects = Topic.with_object
     assert_operator objects.length, :>, 0
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 3fe3122fa1..1329a92e07 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1059,10 +1059,6 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal Post.all, all_posts.all
   end
 
-  def test_extensions_with_except
-    assert_equal 2, Topic.named_extension.order(:author_name).except(:order).two
-  end
-
   def test_only
     relation = Post.where(:author_id => 1).order('id ASC').limit(1)
     assert_equal [posts(:welcome)], relation.all
@@ -1074,10 +1070,6 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal Post.limit(1).all.first, all_posts.first
   end
 
-  def test_extensions_with_only
-    assert_equal 2, Topic.named_extension.order(:author_name).only(:order).two
-  end
-
   def test_anonymous_extension
     relation = Post.where(:author_id => 1).order('id ASC').extending do
       def author
@@ -1106,9 +1098,7 @@ class RelationTest < ActiveRecord::TestCase
 
   def test_default_scope_order_with_scope_order
     assert_equal 'zyke', CoolCar.order_using_new_style.limit(1).first.name
-    assert_equal 'zyke', CoolCar.order_using_old_style.limit(1).first.name
     assert_equal 'zyke', FastCar.order_using_new_style.limit(1).first.name
-    assert_equal 'zyke', FastCar.order_using_old_style.limit(1).first.name
   end
 
   def test_order_using_scoping
@@ -1125,10 +1115,7 @@ class RelationTest < ActiveRecord::TestCase
 
   def test_unscoped_block_style
     assert_equal 'honda', CoolCar.unscoped { CoolCar.order_using_new_style.limit(1).first.name}
-    assert_equal 'honda', CoolCar.unscoped { CoolCar.order_using_old_style.limit(1).first.name}
-
     assert_equal 'honda', FastCar.unscoped { FastCar.order_using_new_style.limit(1).first.name}
-    assert_equal 'honda', FastCar.unscoped { FastCar.order_using_old_style.limit(1).first.name}
   end
 
   def test_intersection_with_array
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/post.rb b/activerecord/test/models/post.rb
index 5002ab9ff8..18810f2de8 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,9 +27,7 @@ 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
diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index 0625b8d296..ef9de9669c 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) }
@@ -35,18 +35,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"