Make use of silence_stderr in script/lighttpd, script/plugin, and Rails::Info

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

1 files changed, 30 insertions, 11 deletions

diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index 4d85d8dae8..e3daf0bcd5 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -5,10 +5,22 @@ require 'test/unit'
 require 'active_support'
 require 'rails_info'
 
-class << Rails::Info
-protected
-  def svn_info
-    <<-EOS
+class InfoTest < Test::Unit::TestCase
+  def setup
+    Rails.send :remove_const, :Info
+    silence_warnings { load 'rails_info.rb' }
+  end
+  
+  def test_edge_rails_revision_not_set_when_svn_info_is_empty
+    Rails::Info.property 'Test that this will not be defined' do
+      Rails::Info.edge_rails_revision ''
+    end
+    assert !property_defined?('Test that this will not be defined')
+  end
+  
+  def test_edge_rails_revision_extracted_from_svn_info
+    Rails::Info.property 'Test Edge Rails revision' do
+      Rails::Info.edge_rails_revision <<-EOS
 Path: .
 URL: http://www.rubyonrails.com/svn/rails/trunk
 Repository UUID: 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
@@ -20,13 +32,10 @@ Last Changed Rev: 2881
 Last Changed Date: 2005-11-04 21:04:41 -0600 (Fri, 04 Nov 2005)
 Properties Last Updated: 2005-10-28 19:30:00 -0500 (Fri, 28 Oct 2005)
 
-    EOS
-  end
-end
-
-class InfoTest < Test::Unit::TestCase
-  def test_edge_rails_revision_extracted_from_svn_info
-    assert_equal '2881', Rails::Info.edge_rails_revision
+EOS
+    end
+  
+    assert_property 'Test Edge Rails revision', '2881'
   end
   
   def test_property_with_block_swallows_exceptions_and_ignores_property
@@ -57,6 +66,16 @@ class InfoTest < Test::Unit::TestCase
   end
 
 protected
+  def svn_info=(info)
+    Rails::Info.module_eval do
+      class << self
+        def svn_info
+          info
+        end
+      end
+    end
+  end
+  
   def properties
     Rails::Info.properties
   end