Merge branch 'master' of https://github.com/rails/rails into performance_test

1 files changed, 15 insertions, 11 deletions

diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index 6440dbe8ab..60e750e6c4 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -1,10 +1,20 @@
 class Topic < ActiveRecord::Base
   scope :base
-  scope :written_before, lambda { |time|
-    if time
-      { :conditions => ['written_on < ?', time] }
-    end
-  }
+
+  ActiveSupport::Deprecation.silence do
+    scope :written_before, lambda { |time|
+      if time
+        { :conditions => ['written_on < ?', time] }
+      end
+    }
+
+    scope :with_object, Class.new(Struct.new(:klass)) {
+      def call
+        klass.where(:approved => true)
+      end
+    }.new(self)
+  end
+
   scope :approved, :conditions => {:approved => true}
   scope :rejected, :conditions => {:approved => false}
 
@@ -19,12 +29,6 @@ class Topic < ActiveRecord::Base
     end
   end
 
-  scope :with_object, Class.new(Struct.new(:klass)) {
-    def call
-      klass.where(:approved => true)
-    end
-  }.new(self)
-
   module NamedExtension
     def two
       2