Merge pull request #340 from joshk/default_scope_changes.

removed the default_scope deprecations and updated the docs and tests to 

2 files changed, 24 insertions, 20 deletions

diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 2ed676fe69..864b3d4846 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -355,6 +355,12 @@ class DefaultScopingTest < ActiveRecord::TestCase
     assert_equal 50000,   wheres[:salary]
   end
 
+  def test_default_scope_with_module_includes
+    wheres = ModuleIncludedPoorDeveloperCalledJamis.scoped.where_values_hash
+    assert_equal "Jamis", wheres[:name]
+    assert_equal 50000,   wheres[:salary]
+  end
+
   def test_default_scope_with_multiple_calls
     wheres = MultiplePoorDeveloperCalledJamis.scoped.where_values_hash
     assert_equal "Jamis", wheres[:name]
@@ -456,18 +462,4 @@ class DefaultScopingTest < ActiveRecord::TestCase
     assert DeveloperCalledJamis.unscoped.poor.include?(developers(:david).becomes(DeveloperCalledJamis))
     assert_equal 10, DeveloperCalledJamis.unscoped.poor.length
   end
-
-  def test_multiple_default_scope_calls_are_deprecated
-    klass = Class.new(ActiveRecord::Base)
-
-    assert_not_deprecated do
-      klass.send(:default_scope, :foo => :bar)
-    end
-
-    assert_deprecated do
-      klass.send(:default_scope, :foo => :bar)
-    end
-
-    assert_equal 2, klass.default_scopes.length
-  end
 end
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 10701dd6fd..152f804e16 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -129,28 +129,40 @@ end
 
 class DeveloperCalledJamis < ActiveRecord::Base
   self.table_name = 'developers'
+
   default_scope where(:name => 'Jamis')
   scope :poor, where('salary < 150000')
 end
 
 class PoorDeveloperCalledJamis < ActiveRecord::Base
   self.table_name = 'developers'
+
   default_scope where(:name => 'Jamis', :salary => 50000)
 end
 
 class InheritedPoorDeveloperCalledJamis < DeveloperCalledJamis
   self.table_name = 'developers'
 
-  ActiveSupport::Deprecation.silence do
-    default_scope where(:salary => 50000)
-  end
+  default_scope where(:salary => 50000)
 end
 
 class MultiplePoorDeveloperCalledJamis < ActiveRecord::Base
   self.table_name = 'developers'
+
   default_scope where(:name => 'Jamis')
+  default_scope where(:salary => 50000)
+end
 
-  ActiveSupport::Deprecation.silence do
-    default_scope where(:salary => 50000)
-  end
+module SalaryDefaultScope
+  extend ActiveSupport::Concern
+
+  included { default_scope where(:salary => 50000) }
 end
+
+class ModuleIncludedPoorDeveloperCalledJamis < DeveloperCalledJamis
+  self.table_name = 'developers'
+
+  include SalaryDefaultScope
+end
+
+