updating deprecated AR syntax

Author: Anna

test/cases/eager_test_sqlserver.rb

@@ -15,7 +15,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
   fixtures :posts, :comments, :authors
 
   def test_coerced_count_with_include
-    assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "len(comments.body) > 15")
+    assert_equal 3, authors(:david).posts_with_comments.where("len(comments.body) > 15").count
   end
 
 

test/cases/offset_and_limit_test_sqlserver.rb

@@ -53,25 +53,24 @@ class OffsetAndLimitTestSqlserver < ActiveRecord::TestCase
     should 'add locks to deepest sub select' do
       pattern = /FROM \[books\]\s+WITH \(NOLOCK\)/
       assert_sql(pattern) { Book.limit(3).lock('WITH (NOLOCK)').offset(5).load }
-      assert_sql(pattern) { Book.count :limit => 3, :offset => 5, :lock => 'WITH (NOLOCK)' }
     end
 
     should 'have valid sort order' do
-      order_row_numbers = SqlServerOrderRowNumber.offset(7).order("c DESC").select("c, ROW_NUMBER() OVER (ORDER BY c ASC) AS [dummy]").all.map(&:c)
+      order_row_numbers = SqlServerOrderRowNumber.offset(7).order("c DESC").select("c, ROW_NUMBER() OVER (ORDER BY c ASC) AS [dummy]").load.map(&:c)
       assert_equal [2, 1, 0], order_row_numbers
     end
 
     should 'work with through associations' do
-      assert_equal people(:david), jobs(:unicyclist).people.limit(1).offset(1).all.first
+      assert_equal people(:david), jobs(:unicyclist).people.limit(1).offset(1).first
     end
 
     should 'work with through uniq associations' do
       david = authors(:david)
       mary = authors(:mary)
       thinking = posts(:thinking)
       # Mary has duplicate categorizations to the thinking post.
-      assert_equal [thinking, thinking], mary.categorized_posts.all
-      assert_equal [thinking], mary.unique_categorized_posts.limit(2).offset(0)
+      assert_equal [thinking, thinking], mary.categorized_posts.load
+      assert_equal [thinking], mary.unique_categorized_posts.limit(2).offset(0).load
       # Paging thru David's uniq ordered comments, with count too.
       assert_equal [1, 2, 3, 5, 6, 7, 8, 9, 10, 12], david.ordered_uniq_comments.map(&:id)
       assert_equal [3, 5], david.ordered_uniq_comments.limit(2).offset(2).map(&:id)
@@ -83,7 +82,7 @@ class OffsetAndLimitTestSqlserver < ActiveRecord::TestCase
     should 'remove [__rnt] table names from relation reflection and hence do not eager loading' do
       create_10_books
       create_10_books
-      assert_queries(1) { Book.limit(10).offset(10).includes(:subscriptions).all }
+      assert_queries(1) { Book.includes(:subscriptions).limit(10).offset(10).references(:subscriptions).load }
     end
 
 

test/cases/schema_dumper_test_sqlserver.rb

@@ -10,8 +10,7 @@ class SchemaDumperTestSqlserver < ActiveRecord::TestCase
     should 'honor nonstandards' do
       table_dump('movies') do |output|
         match = output.match(%r{create_table "movies"(.*)do})
-        assert_not_nil(match, "nonstandardpk table not found")
-        puts "**#{output}"       
+        assert_not_nil(match, "nonstandardpk table not found")     
         assert_match %r(primary_key: "movieid"), match[1], "non-standard primary key not preserved"
       end
     end