aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorMarc-Andre Lafortune <github@marc-andre.ca>2012-12-22 12:10:40 -0500
committerMarc-Andre Lafortune <github@marc-andre.ca>2012-12-22 20:40:42 -0500
commita4932d6a63e9883408537145e1f81477c27df3fc (patch)
tree09dd205dd8131fb1e24fa62e0adfc7b8bfd73b9d /railties/test
parentf9da785d0b1b22317cfca25c15fb555e9016accb (diff)
downloadrails-a4932d6a63e9883408537145e1f81477c27df3fc.tar.gz
rails-a4932d6a63e9883408537145e1f81477c27df3fc.tar.bz2
rails-a4932d6a63e9883408537145e1f81477c27df3fc.zip
Fixes for PR [#8267]
* Fix Migration#reversible by not using `transaction`. * Adapt mysql adapter to updated api for remove_column * Update test after aedcd683684d08eaf30623a4b48ce31a31426372
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/rake/migrations_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
index 0a47fd014c..33c753868c 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -50,9 +50,9 @@ module ApplicationTests
assert_match(/AddEmailToUsers: migrated/, output)
output = `rake db:rollback STEP=2`
- assert_match(/drop_table\("users"\)/, output)
+ assert_match(/drop_table\(:users\)/, output)
assert_match(/CreateUsers: reverted/, output)
- assert_match(/remove_column\("users", :email\)/, output)
+ assert_match(/remove_column\(:users, :email, :string\)/, output)
assert_match(/AddEmailToUsers: reverted/, output)
end
end