aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-12-23 08:16:07 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-12-23 08:16:07 -0800
commit7ab469c839d70ea9fbc74eb3bfe273037a91af69 (patch)
treed0b167777ba4466c3eb779d3dde5fd5895f5ca7f /railties
parenta4d21f764c2e6ebea5f506aa0fe8db71e2969c54 (diff)
parenta4932d6a63e9883408537145e1f81477c27df3fc (diff)
downloadrails-7ab469c839d70ea9fbc74eb3bfe273037a91af69.tar.gz
rails-7ab469c839d70ea9fbc74eb3bfe273037a91af69.tar.bz2
rails-7ab469c839d70ea9fbc74eb3bfe273037a91af69.zip
Merge pull request #8588 from marcandre/fix_reversible
Fix Migration#reversible by not using `transaction`.
Diffstat (limited to 'railties')
-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