fix a failure and some warnings on 1.9.2 [#4417 state:resolved]

Signed-off-by: Xavier Noria <fxn@hashref.com>
rails · Apr 16, 2010 · 779723a · 779723a
1 parent 9c08ccd
commit 779723a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
@@ -2054,7 +2054,7 @@ def test_descends_from_active_record
   end
 
   def test_base_subclasses_is_public_method
-    assert ActiveRecord::Base.public_methods.include?("subclasses")
+    assert ActiveRecord::Base.public_methods.map(&:to_sym).include?(:subclasses)
   end
 
   def test_find_on_abstract_base_class_doesnt_use_type_condition

diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
@@ -26,7 +26,7 @@ class FixturesTest < ActiveRecord::TestCase
   FIXTURES = %w( accounts binaries companies customers
                  developers developers_projects entrants
                  movies projects subscribers topics tasks )
-  MATCH_ATTRIBUTE_NAME = /[a-zA-Z][-_\w]*/
+  MATCH_ATTRIBUTE_NAME = /[a-zA-Z][-\w]*/
 
   def test_clean_fixtures
     FIXTURES.each do |name|