aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-28 09:35:22 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-28 09:35:22 -0700
commit27d12bde1f2ef9bac24d24d576f23eee68544ca0 (patch)
tree8526fa4256437ea48703a3056b8155a4180cf3f9 /activerecord
parent56edecbf24c7c05957ee64b25b2d3c957afca632 (diff)
parent77a7382b085342ac61f59cdd1f63f996c4818f6d (diff)
downloadrails-27d12bde1f2ef9bac24d24d576f23eee68544ca0.tar.gz
rails-27d12bde1f2ef9bac24d24d576f23eee68544ca0.tar.bz2
rails-27d12bde1f2ef9bac24d24d576f23eee68544ca0.zip
Merge pull request #9977 from vipulnsward/fix_column_test_typo
anual_salary => annual_salary
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/migration/columns_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/migration/columns_test.rb b/activerecord/test/cases/migration/columns_test.rb
index 52906c8a01..2d7a7ec73a 100644
--- a/activerecord/test/cases/migration/columns_test.rb
+++ b/activerecord/test/cases/migration/columns_test.rb
@@ -55,10 +55,10 @@ module ActiveRecord
default_before = connection.columns("test_models").find { |c| c.name == "salary" }.default
assert_equal 70000, default_before
- rename_column "test_models", "salary", "anual_salary"
+ rename_column "test_models", "salary", "annual_salary"
- assert TestModel.column_names.include?("anual_salary")
- default_after = connection.columns("test_models").find { |c| c.name == "anual_salary" }.default
+ assert TestModel.column_names.include?("annual_salary")
+ default_after = connection.columns("test_models").find { |c| c.name == "annual_salary" }.default
assert_equal 70000, default_after
end