5 files changed, 54 insertions, 7 deletions
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 9e44e8e088..d5e3da4d88 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -530,6 +530,11 @@ class FilterTest < ActionController::TestCase
     assert sweeper.before(TestController.new)
   end
 
+  def test_after_method_of_sweeper_should_always_return_nil
+    sweeper = ActionController::Caching::Sweeper.send(:new)
+    assert_nil sweeper.after(TestController.new)
+  end
+
   def test_non_yielding_around_filters_not_returning_false_do_not_raise
     controller = NonYieldingAroundFilterController.new
     controller.instance_variable_set "@filter_return_value", true
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 26270571cf..afb2d39955 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -509,7 +509,7 @@ end
 class RespondWithController < ActionController::Base
   respond_to :html, :json
   respond_to :xml, :except => :using_resource_with_block
-  respond_to :js,  :only => [ :using_resource_with_block, :using_resource ]
+  respond_to :js,  :only => [ :using_resource_with_block, :using_resource, :using_hash_resource ]
 
   def using_resource
     respond_with(resource)
@@ -575,11 +575,6 @@ protected
   def resource
     Customer.new("david", request.delete? ? nil : 13)
   end
-
-  def _render_js(js, options)
-    self.content_type ||= Mime::JS
-    self.response_body = js.respond_to?(:to_js) ? js.to_js : js
-  end
 end
 
 class InheritedRespondWithController < RespondWithController
@@ -638,6 +633,20 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
+  def test_using_resource_with_js_simply_tries_to_render_the_template
+    @request.accept = "text/javascript"
+    get :using_resource
+    assert_equal "text/javascript", @response.content_type
+    assert_equal "alert(\"Hi\");", @response.body
+  end
+
+  def test_using_hash_resource_with_js_raises_an_error_if_template_cant_be_found
+    @request.accept = "text/javascript"
+    assert_raise ActionView::MissingTemplate do
+      get :using_hash_resource
+    end
+  end
+
   def test_using_hash_resource
     @request.accept = "application/xml"
     get :using_hash_resource
@@ -650,6 +659,13 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_equal %Q[{"result":{"name":"david","id":13}}], @response.body
   end
 
+  def test_using_hash_resource_with_post
+    @request.accept = "application/json"
+    assert_raise ArgumentError, "Nil location provided. Can't build URI." do
+      post :using_hash_resource
+    end
+  end
+
   def test_using_resource_with_block
     @request.accept = "*/*"
     get :using_resource_with_block
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index 48cf0ab9cb..1a17e24914 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -10,9 +10,9 @@ module RenderStreaming
     )]
 
     layout "application"
-    stream :only => [:hello_world, :skip]
 
     def hello_world
+      render :stream => true
     end
 
     def layout_exception
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index c7c8360ae6..8f885ff28e 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -138,6 +138,25 @@ class SendFileTest < ActionController::TestCase
     @controller.headers = {}
     assert_raise(ArgumentError){ @controller.send(:send_file_headers!, options) }
   end
+  
+  def test_send_file_headers_guess_type_from_extension
+    {
+      'image.png' => 'image/png',
+      'image.jpeg' => 'image/jpeg',
+      'image.jpg' => 'image/jpeg',
+      'image.tif' => 'image/tiff',
+      'image.gif' => 'image/gif',
+      'movie.mpg' => 'video/mpeg',
+      'file.zip' => 'application/zip',
+      'file.unk' => 'application/octet-stream',
+      'zip' => 'application/octet-stream'
+    }.each do |filename,expected_type|
+      options = { :filename => filename }
+      @controller.headers = {}
+      @controller.send(:send_file_headers!, options)
+      assert_equal expected_type, @controller.content_type
+    end
+  end
 
   %w(file data).each do |method|
     define_method "test_send_#{method}_status" do
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 6265e78030..043d44500a 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -649,6 +649,13 @@ XML
 
   end
 
+  def test_fixture_path_is_accessed_from_self_instead_of_active_support_test_case
+    TestTest.stubs(:fixture_path).returns(FILES_DIR)
+
+    uploaded_file = fixture_file_upload('/mona_lisa.jpg', 'image/png')
+    assert_equal File.open("#{FILES_DIR}/mona_lisa.jpg", READ_PLAIN).read, uploaded_file.read
+  end
+
   def test_test_uploaded_file_with_binary
     filename = 'mona_lisa.jpg'
     path = "#{FILES_DIR}/#{filename}"