aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-25 08:56:29 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-25 08:56:29 -0700
commitba012fa04d567438d42f37f9454c6062663e6e4f (patch)
treefe2be7ecdb3d75f91d86a4ad3b00cd2c9650c749 /activerecord/test/cases
parent1d4541900dd9e5786bee5b700a651f996a379f48 (diff)
parent24fee97581824e6c8fde166ef15b3a28038a9ab8 (diff)
downloadrails-ba012fa04d567438d42f37f9454c6062663e6e4f.tar.gz
rails-ba012fa04d567438d42f37f9454c6062663e6e4f.tar.bz2
rails-ba012fa04d567438d42f37f9454c6062663e6e4f.zip
Merge pull request #9864 from vipulnsward/fix_test_AR_v2
Introduce test on Error#full_message for attribute with underscores; Fix...
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/base_test.rb2
-rw-r--r--activerecord/test/cases/nested_attributes_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 7fb50e9617..5cbb758e4c 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1024,7 +1024,7 @@ class BasicsTest < ActiveRecord::TestCase
Joke.reset_sequence_name
end
- def test_dont_clear_inheritnce_column_when_setting_explicitly
+ def test_dont_clear_inheritance_column_when_setting_explicitly
Joke.inheritance_column = "my_type"
before_inherit = Joke.inheritance_column
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 7042d7f4b6..b6e140b912 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -806,7 +806,7 @@ module NestedAttributesOnACollectionAssociationTests
assert_nothing_raised(NoMethodError) { @pirate.save! }
end
- def test_numeric_colum_changes_from_zero_to_no_empty_string
+ def test_numeric_column_changes_from_zero_to_no_empty_string
Man.accepts_nested_attributes_for(:interests)
repair_validations(Interest) do