diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-15 16:59:29 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-15 16:59:29 -0200 |
commit | 8c66623627277df9dcc3c6215d369d2c50775cc1 (patch) | |
tree | 6f0d147f1508c9b24e455b0efc48d660e53a24d9 /activerecord/test/cases/tasks/sqlite_rake_test.rb | |
parent | f6f4bed34d7f654e0dde8b2cd369066d0857e91c (diff) | |
parent | 22f80ae57b26907f662b7fd50a7270a6381e527e (diff) | |
download | rails-8c66623627277df9dcc3c6215d369d2c50775cc1.tar.gz rails-8c66623627277df9dcc3c6215d369d2c50775cc1.tar.bz2 rails-8c66623627277df9dcc3c6215d369d2c50775cc1.zip |
Merge pull request #12531 from iamvery/database-tasks-exit-status
Explicitly exit with status "1" for create and drop task failures
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases/tasks/sqlite_rake_test.rb')
-rw-r--r-- | activerecord/test/cases/tasks/sqlite_rake_test.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb index da3471adf9..eecc3527d2 100644 --- a/activerecord/test/cases/tasks/sqlite_rake_test.rb +++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb @@ -27,7 +27,9 @@ module ActiveRecord $stderr.expects(:puts).with("#{@database} already exists") - ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + assert_raises(ActiveRecord::Tasks::DatabaseAlreadyExists) do + ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + end end def test_db_create_with_file_does_nothing @@ -36,7 +38,9 @@ module ActiveRecord ActiveRecord::Base.expects(:establish_connection).never - ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + assert_raises(ActiveRecord::Tasks::DatabaseAlreadyExists) do + ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + end end def test_db_create_establishes_a_connection @@ -52,7 +56,9 @@ module ActiveRecord $stderr.expects(:puts). with("Couldn't create database for #{@configuration.inspect}") - ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + assert_raises(Exception) do + ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + end end end |