vendor/rails/actionpack/test/controller/send_file_test.rb in radiant-0.6.4 vs vendor/rails/actionpack/test/controller/send_file_test.rb in radiant-0.6.5

@@ -19,15 +19,17 @@
   def data() send_data(file_data, options) end
 
   def rescue_action(e) raise end
 end
 
-SendFileController.template_root = File.dirname(__FILE__) + "/../fixtures/"
+SendFileController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
 
 class SendFileTest < Test::Unit::TestCase
   include TestFileUtils
 
+  Mime::Type.register "image/png", :png unless defined? Mime::PNG
+  
   def setup
     @controller = SendFileController.new
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
   end
@@ -51,10 +53,18 @@
     output = StringIO.new
     output.binmode
     assert_nothing_raised { response.body.call(response, output) }
     assert_equal file_data, output.string
   end
+  
+  def test_file_url_based_filename
+    @controller.options = { :url_based_filename => true }
+    response = nil
+    assert_nothing_raised { response = process('file') }
+    assert_not_nil response
+    assert_equal "attachment", response.headers["Content-Disposition"]
+  end
 
   def test_data
     response = nil
     assert_nothing_raised { response = process('data') }
     assert_not_nil response
@@ -63,21 +73,21 @@
     assert_equal file_data, response.body
   end
 
   def test_headers_after_send_shouldnt_include_charset
     response = process('data')
-    assert_equal "application/octet-stream", response.headers["Content-Type"]
+    assert_equal "application/octet-stream", response.content_type
 
     response = process('file')
-    assert_equal "application/octet-stream", response.headers["Content-Type"]
+    assert_equal "application/octet-stream", response.content_type
   end
 
   # Test that send_file_headers! is setting the correct HTTP headers.
   def test_send_file_headers!
     options = {
       :length => 1,
-      :type => 'type',
+      :type => Mime::PNG,
       :disposition => 'disposition',
       :filename => 'filename'
     }
 
     # Do it a few times: the resulting headers should be identical
@@ -88,11 +98,11 @@
     @controller.send(:send_file_headers!, options)
     @controller.send(:send_file_headers!, options)
 
     h = @controller.headers
     assert_equal 1, h['Content-Length']
-    assert_equal 'type', h['Content-Type']
+    assert_equal 'image/png', h['Content-Type']
     assert_equal 'disposition; filename="filename"', h['Content-Disposition']
     assert_equal 'binary', h['Content-Transfer-Encoding']
 
     # test overriding Cache-Control: no-cache header to fix IE open/save dialog
     @controller.headers = { 'Cache-Control' => 'no-cache' }
@@ -103,15 +113,15 @@
 
   %w(file data).each do |method|
     define_method "test_send_#{method}_status" do
       @controller.options = { :stream => false, :status => 500 }
       assert_nothing_raised { assert_not_nil process(method) }
-      assert_equal '500 Internal Server Error', @controller.headers['Status']
+      assert_equal '500 Internal Server Error', @response.headers['Status']
     end
 
     define_method "test_default_send_#{method}_status" do
       @controller.options = { :stream => false }
       assert_nothing_raised { assert_not_nil process(method) }
-      assert_equal ActionController::Base::DEFAULT_RENDER_STATUS_CODE, @controller.headers['Status']
+      assert_equal ActionController::Base::DEFAULT_RENDER_STATUS_CODE, @response.headers['Status']
     end
   end
 end