Merge remote branch 'miloops/warnings'

3 files changed, 13 insertions, 1 deletions

diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index d9d258e593..5a8b763717 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -32,6 +32,8 @@ class ActionPackAssertionsController < ActionController::Base
 
   def redirect_to_path() redirect_to '/some/path' end
 
+  def redirect_invalid_external_route() redirect_to 'ht_tp://www.rubyonrails.org' end
+
   def redirect_to_named_route() redirect_to route_one_url end
 
   def redirect_external() redirect_to "http://www.rubyonrails.org"; end
@@ -368,6 +370,11 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     end
   end
 
+  def test_redirect_invalid_external_route
+    process :redirect_invalid_external_route
+    assert_redirected_to "http://test.hostht_tp://www.rubyonrails.org"
+  end
+
   def test_redirected_to_url_full_url
     process :redirect_to_path
     assert_redirected_to 'http://test.host/some/path'
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
index eb426e855b..d78acb8ce8 100644
--- a/actionpack/test/controller/capture_test.rb
+++ b/actionpack/test/controller/capture_test.rb
@@ -25,6 +25,10 @@ class CaptureController < ActionController::Base
     render :layout => "talk_from_action"
   end
 
+  def proper_block_detection
+    @todo = "some todo"
+  end
+
   def rescue_action(e) raise end
 end
 
@@ -66,8 +70,8 @@ class CaptureTest < ActionController::TestCase
   end
 
   def test_proper_block_detection
-    @todo = "some todo"
     get :proper_block_detection
+    assert_equal "some todo", @response.body
   end
 
   private
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index d13ebc705a..dfc90943e1 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -314,6 +314,7 @@ class FilterTest < ActionController::TestCase
 
     def initialize
       @@execution_log = ""
+      super()
     end
 
     before_filter { |c| c.class.execution_log << " before procfilter "  }