Merge pull request #4791 from gregolsen/reflection_test_fixed

reflection test fixed

activerecord/test/cases/associations/has_many_associations_test.rb

@@ -1280,7 +1280,7 @@ def test_get_ids_for_unloaded_finder_sql_associations_loads_them
   end
 
   def test_get_ids_for_ordered_association
-    assert_equal [companies(:second_client).id, companies(:first_client).id], companies(:first_firm).clients_ordered_by_rating_ids
+    assert_equal [companies(:second_client).id, companies(:first_client).id], companies(:first_firm).clients_ordered_by_name_ids
   end
 
   def test_assign_ids_ignoring_blanks

activerecord/test/cases/reflection_test.rb

@@ -189,8 +189,8 @@ def test_association_reflection_in_modules
 
   def test_reflection_of_all_associations
     # FIXME these assertions bust a lot
-    assert_equal 38, Firm.reflect_on_all_associations.size
-    assert_equal 28, Firm.reflect_on_all_associations(:has_many).size
+    assert_equal 39, Firm.reflect_on_all_associations.size
+    assert_equal 29, Firm.reflect_on_all_associations(:has_many).size
     assert_equal 10, Firm.reflect_on_all_associations(:has_one).size
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
   end

activerecord/test/models/company.rb

@@ -45,7 +45,7 @@ class Firm < Company
   has_many :unsorted_clients_with_symbol, :class_name => :Client
   has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
   has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
-  has_many :clients_ordered_by_rating, :order => "rating", :class_name => "Client"
+  has_many :clients_ordered_by_name, :order => "name", :class_name => "Client"
   has_many :unvalidated_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :validate => false
   has_many :dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :destroy
   has_many :exclusively_dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all