aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/migration_test.rb
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2015-01-15 12:12:33 +0530
committerVipul A M <vipulnsward@gmail.com>2015-01-20 22:28:48 +0530
commit166ce95f65cd6b54e23d43e0e61875d6c3a38047 (patch)
tree8ee4222277b604cd39b27b78e8db0b4a5087bb69 /activerecord/test/cases/migration_test.rb
parent850159bd2c5e1e108d0256dd05424bbbf7926b59 (diff)
downloadrails-166ce95f65cd6b54e23d43e0e61875d6c3a38047.tar.gz
rails-166ce95f65cd6b54e23d43e0e61875d6c3a38047.tar.bz2
rails-166ce95f65cd6b54e23d43e0e61875d6c3a38047.zip
- Extracted silence_stream method to new module in activesupport/testing.
- Added include for the same in ActiveSupport::Test. - Removed occurrences of silence_stream being used elsewhere. - Reordered activesupport testcase requires alphabetically. - Removed require of silence stream from test_case - Moved quietly method to stream helper - Moved capture output to stream helper module and setup requires for the same elsewhere
Diffstat (limited to 'activerecord/test/cases/migration_test.rb')
-rw-r--r--activerecord/test/cases/migration_test.rb22
1 files changed, 3 insertions, 19 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 7c2d3e81d6..aed9db997a 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1,3 +1,4 @@
+require 'active_support/testing/stream'
require "cases/helper"
require "cases/migration/helper"
require 'bigdecimal/util'
@@ -718,6 +719,8 @@ if ActiveRecord::Base.connection.supports_bulk_alter?
end
class CopyMigrationsTest < ActiveRecord::TestCase
+ include ActiveSupport::Testing::Stream
+
def setup
end
@@ -927,23 +930,4 @@ class CopyMigrationsTest < ActiveRecord::TestCase
ActiveRecord::Base.logger = old
end
- private
-
- def quietly
- silence_stream(STDOUT) do
- silence_stream(STDERR) do
- yield
- end
- end
- end
-
- def silence_stream(stream)
- old_stream = stream.dup
- stream.reopen(IO::NULL)
- stream.sync = true
- yield
- ensure
- stream.reopen(old_stream)
- old_stream.close
- end
end