From 9a0e3d44d118240d4e7f4049bcfedf0c14771b9b Mon Sep 17 00:00:00 2001
From: Vishnu Atrai <me@vishnuatrai.com>
Date: Wed, 11 May 2011 00:15:16 +0530
Subject: minor cleaning with new api method

---
 activerecord/test/cases/method_scoping_test.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb
index 7f0f007a70..a0cb5dbdc5 100644
--- a/activerecord/test/cases/method_scoping_test.rb
+++ b/activerecord/test/cases/method_scoping_test.rb
@@ -68,7 +68,7 @@ class MethodScopingTest < ActiveRecord::TestCase
 
   def test_scoped_find_all
     Developer.send(:with_scope, :find => { :conditions => "name = 'David'" }) do
-      assert_equal [developers(:david)], Developer.find(:all)
+      assert_equal [developers(:david)], Developer.all
     end
   end
 
@@ -235,23 +235,23 @@ class MethodScopingTest < ActiveRecord::TestCase
   def test_immutable_scope
     options = { :conditions => "name = 'David'" }
     Developer.send(:with_scope, :find => options) do
-      assert_equal %w(David), Developer.find(:all).map { |d| d.name }
+      assert_equal %w(David), Developer.all.map(&:name)
       options[:conditions] = "name != 'David'"
-      assert_equal %w(David), Developer.find(:all).map { |d| d.name }
+      assert_equal %w(David), Developer.all.map(&:name)
     end
 
     scope = { :find => { :conditions => "name = 'David'" }}
     Developer.send(:with_scope, scope) do
-      assert_equal %w(David), Developer.find(:all).map { |d| d.name }
+      assert_equal %w(David), Developer.all.map(&:name)
       scope[:find][:conditions] = "name != 'David'"
-      assert_equal %w(David), Developer.find(:all).map { |d| d.name }
+      assert_equal %w(David), Developer.all.map(&:name)
     end
   end
 
   def test_scoped_with_duck_typing
     scoping = Struct.new(:current_scope).new(:find => { :conditions => ["name = ?", 'David'] })
     Developer.send(:with_scope, scoping) do
-       assert_equal %w(David), Developer.find(:all).map { |d| d.name }
+       assert_equal %w(David), Developer.all.map(&:name)
     end
   end
 
@@ -432,7 +432,7 @@ class NestedScopingTest < ActiveRecord::TestCase
   def test_merged_scoped_find_combines_and_sanitizes_conditions
     Developer.send(:with_scope, :find => { :conditions => ["name = ?", 'David'] }) do
       Developer.send(:with_scope, :find => { :conditions => ['salary > ?', 9000] }) do
-        assert_equal %w(David), Developer.find(:all).map { |d| d.name }
+        assert_equal %w(David), Developer.all.map(&:name)
       end
     end
   end
@@ -487,9 +487,9 @@ class NestedScopingTest < ActiveRecord::TestCase
     options2 = { :conditions => "name = 'David'" }
     Developer.send(:with_scope, :find => options1) do
       Developer.send(:with_exclusive_scope, :find => options2) do
-        assert_equal %w(David), Developer.find(:all).map { |d| d.name }
+        assert_equal %w(David), Developer.all.map(&:name)
         options1[:conditions] = options2[:conditions] = nil
-        assert_equal %w(David), Developer.find(:all).map { |d| d.name }
+        assert_equal %w(David), Developer.all.map(&:name)
       end
     end
   end
@@ -499,9 +499,9 @@ class NestedScopingTest < ActiveRecord::TestCase
     options2 = { :conditions => "salary > 10000" }
     Developer.send(:with_scope, :find => options1) do
       Developer.send(:with_scope, :find => options2) do
-        assert_equal %w(Jamis), Developer.find(:all).map { |d| d.name }
+        assert_equal %w(Jamis), Developer.all.map(&:name)
         options1[:conditions] = options2[:conditions] = nil
-        assert_equal %w(Jamis), Developer.find(:all).map { |d| d.name }
+        assert_equal %w(Jamis), Developer.all.map(&:name)
       end
     end
   end
-- 
cgit v1.2.3