r2822@asus: jeremy | 2005-07-04 21:14:30 -0700

 silence warnings re. class redefinitions


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1687 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 9 insertions, 7 deletions

diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 47db7136f4..461da8dbc0 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
 
-Customer = Struct.new("Customer", :name)
+silence_warnings { Customer = Struct.new("Customer", :name) }
 
 module Fun
   class GamesController < ActionController::Base
diff --git a/actionpack/test/template/active_record_helper_test.rb b/actionpack/test/template/active_record_helper_test.rb
index 853f37660f..cfbe3b62b7 100644
--- a/actionpack/test/template/active_record_helper_test.rb
+++ b/actionpack/test/template/active_record_helper_test.rb
@@ -15,13 +15,15 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::FormTagHelper
 
-  Post   = Struct.new("Post", :title, :author_name, :body, :secret, :written_on)
-  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)
+    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
+    Column = Struct.new("Column", :type, :name, :human_name)
   end
-  Column = Struct.new("Column", :type, :name, :human_name)
 
   def setup
     @post = Post.new