aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/tasks/postgresql_rake_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-11-19 13:07:28 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-11-19 13:07:28 -0200
commit728096542aef4820440b2d758cfdc579b399f1e6 (patch)
treea8ba235c7df8f08e474e9ae3925edbde3ad7aa12 /activerecord/test/cases/tasks/postgresql_rake_test.rb
parenta6f58a535ee4647b541988c5a0c8a98b9c6c4249 (diff)
downloadrails-728096542aef4820440b2d758cfdc579b399f1e6.tar.gz
rails-728096542aef4820440b2d758cfdc579b399f1e6.tar.bz2
rails-728096542aef4820440b2d758cfdc579b399f1e6.zip
Revert "Explicitly exit with status "1" for create and drop failures"
This reverts commit 22f80ae57b26907f662b7fd50a7270a6381e527e. See https://github.com/rails/rails/commit/22f80ae57b26907f662b7fd50a7270a6381e527e#commitcomment-4640676 Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases/tasks/postgresql_rake_test.rb')
-rw-r--r--activerecord/test/cases/tasks/postgresql_rake_test.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb
index c01c6de593..43a474e59b 100644
--- a/activerecord/test/cases/tasks/postgresql_rake_test.rb
+++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -60,9 +60,7 @@ module ActiveRecord
$stderr.expects(:puts).
with("Couldn't create database for #{@configuration.inspect}")
- assert_raises(Exception) do
- ActiveRecord::Tasks::DatabaseTasks.create @configuration
- end
+ ActiveRecord::Tasks::DatabaseTasks.create @configuration
end
def test_create_when_database_exists_outputs_info_to_stderr
@@ -72,9 +70,7 @@ module ActiveRecord
ActiveRecord::StatementInvalid.new('database "my-app-db" already exists')
)
- assert_raises(ActiveRecord::Tasks::DatabaseAlreadyExists) do
- ActiveRecord::Tasks::DatabaseTasks.create @configuration
- end
+ ActiveRecord::Tasks::DatabaseTasks.create @configuration
end
end