From 3cf7a0a46037f32b95b5ffb358cb898233d5c5db Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 11 Sep 2005 04:58:27 +0000
Subject: Added Kernel#silence_warnings and puts it into use throughout the
 framework

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2179 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/test/controller/helper_test.rb            |  4 +---
 actionpack/test/template/form_helper_test.rb         | 14 +++++++-------
 actionpack/test/template/form_options_helper_test.rb | 12 ++++++------
 3 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index 77a3fc6115..cd48704e3a 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -121,9 +121,7 @@ class HelperTest < Test::Unit::TestCase
     end
 
     def test_helper=(helper_module)
-      old_verbose, $VERBOSE = $VERBOSE, nil
-      self.class.const_set('TestHelper', helper_module)
-      $VERBOSE = old_verbose
+      silence_warnings { self.class.const_set('TestHelper', helper_module) }
     end
 end
 
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 1b9df865f3..9cc89a5860 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -6,14 +6,14 @@ require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/cor
 class FormHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::FormHelper
 
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  Post = Struct.new("Post", :title, :author_name, :body, :secret, :written_on, :cost)
-  Post.class_eval do
-    alias_method :title_before_type_cast, :title unless respond_to?(:title_before_type_cast)
-    alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
-    alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
+  silence_warnings do
+    Post = Struct.new("Post", :title, :author_name, :body, :secret, :written_on, :cost)
+    Post.class_eval do
+      alias_method :title_before_type_cast, :title unless respond_to?(:title_before_type_cast)
+      alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
+      alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
+    end
   end
-  $VERBOSE = old_verbose
 
   def setup
     @post = Post.new
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 7a83f57341..d92a01a4e3 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -25,12 +25,12 @@ ActionView::Helpers::FormOptionsHelper::TimeZone = MockTimeZone
 class FormOptionsHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::FormOptionsHelper
 
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  Post      = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
-  Continent = Struct.new('Continent', :continent_name, :countries)
-  Country   = Struct.new('Country', :country_id, :country_name)
-  Firm      = Struct.new('Firm', :time_zone)
-  $VERBOSE = old_verbose
+  silence_warnings do
+    Post      = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
+    Continent = Struct.new('Continent', :continent_name, :countries)
+    Country   = Struct.new('Country', :country_id, :country_name)
+    Firm      = Struct.new('Firm', :time_zone)
+  end
 
   def test_collection_options
     @posts = [
-- 
cgit v1.2.3