aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xactiverecord/test/cases/base_test.rb2
-rw-r--r--activerecord/test/cases/fixtures_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 1c3655b587..591e04a077 100755
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -2054,7 +2054,7 @@ class BasicsTest < ActiveRecord::TestCase
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
index e78b522b65..d24283fe4e 100644
--- 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|