actionpack 2.1.2 → 2.2.2

data/test/controller/cgi_test.rb

@@ -3,17 +3,67 @@ require 'action_controller/cgi_process'
 
 class BaseCgiTest < Test::Unit::TestCase
   def setup
-    @request_hash = {"HTTP_MAX_FORWARDS"=>"10", "SERVER_NAME"=>"glu.ttono.us:8007", "FCGI_ROLE"=>"RESPONDER", "HTTP_X_FORWARDED_HOST"=>"glu.ttono.us", "HTTP_ACCEPT_ENCODING"=>"gzip, deflate", "HTTP_USER_AGENT"=>"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/312.5.1 (KHTML, like Gecko) Safari/312.3.1", "PATH_INFO"=>"", "HTTP_ACCEPT_LANGUAGE"=>"en", "HTTP_HOST"=>"glu.ttono.us:8007", "SERVER_PROTOCOL"=>"HTTP/1.1", "REDIRECT_URI"=>"/dispatch.fcgi", "SCRIPT_NAME"=>"/dispatch.fcgi", "SERVER_ADDR"=>"207.7.108.53", "REMOTE_ADDR"=>"207.7.108.53", "SERVER_SOFTWARE"=>"lighttpd/1.4.5", "HTTP_COOKIE"=>"_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes", "HTTP_X_FORWARDED_SERVER"=>"glu.ttono.us", "REQUEST_URI"=>"/admin", "DOCUMENT_ROOT"=>"/home/kevinc/sites/typo/public", "SERVER_PORT"=>"8007", "QUERY_STRING"=>"", "REMOTE_PORT"=>"63137", "GATEWAY_INTERFACE"=>"CGI/1.1", "HTTP_X_FORWARDED_FOR"=>"65.88.180.234", "HTTP_ACCEPT"=>"*/*", "SCRIPT_FILENAME"=>"/home/kevinc/sites/typo/public/dispatch.fcgi", "REDIRECT_STATUS"=>"200", "REQUEST_METHOD"=>"GET"}
+    @request_hash = {
+      "HTTP_MAX_FORWARDS" => "10",
+      "SERVER_NAME" => "glu.ttono.us:8007",
+      "FCGI_ROLE" => "RESPONDER",
+      "AUTH_TYPE" => "Basic",
+      "HTTP_X_FORWARDED_HOST" => "glu.ttono.us",
+      "HTTP_ACCEPT_CHARSET" => "UTF-8",
+      "HTTP_ACCEPT_ENCODING" => "gzip, deflate",
+      "HTTP_CACHE_CONTROL" => "no-cache, max-age=0",
+      "HTTP_PRAGMA" => "no-cache",
+      "HTTP_USER_AGENT" => "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)",
+      "PATH_INFO" => "/homepage/",
+      "HTTP_ACCEPT_LANGUAGE" => "en",
+      "HTTP_NEGOTIATE" => "trans",
+      "HTTP_HOST" => "glu.ttono.us:8007",
+      "HTTP_REFERER" => "http://www.google.com/search?q=glu.ttono.us",
+      "HTTP_FROM" => "googlebot",
+      "SERVER_PROTOCOL" => "HTTP/1.1",
+      "REDIRECT_URI" => "/dispatch.fcgi",
+      "SCRIPT_NAME" => "/dispatch.fcgi",
+      "SERVER_ADDR" => "207.7.108.53",
+      "REMOTE_ADDR" => "207.7.108.53",
+      "REMOTE_HOST" => "google.com",
+      "REMOTE_IDENT" => "kevin",
+      "REMOTE_USER" => "kevin",
+      "SERVER_SOFTWARE" => "lighttpd/1.4.5",
+      "HTTP_COOKIE" => "_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes",
+      "HTTP_X_FORWARDED_SERVER" => "glu.ttono.us",
+      "REQUEST_URI" => "/admin",
+      "DOCUMENT_ROOT" => "/home/kevinc/sites/typo/public",
+      "PATH_TRANSLATED" => "/home/kevinc/sites/typo/public/homepage/",
+      "SERVER_PORT" => "8007",
+      "QUERY_STRING" => "",
+      "REMOTE_PORT" => "63137",
+      "GATEWAY_INTERFACE" => "CGI/1.1",
+      "HTTP_X_FORWARDED_FOR" => "65.88.180.234",
+      "HTTP_ACCEPT" => "*/*",
+      "SCRIPT_FILENAME" => "/home/kevinc/sites/typo/public/dispatch.fcgi",
+      "REDIRECT_STATUS" => "200",
+      "REQUEST_METHOD" => "GET"
+    }
     # some Nokia phone browsers omit the space after the semicolon separator.
     # some developers have grown accustomed to using comma in cookie values.
     @alt_cookie_fmt_request_hash = {"HTTP_COOKIE"=>"_session_id=c84ace847,96670c052c6ceb2451fb0f2;is_admin=yes"}
-    @fake_cgi = Struct.new(:env_table).new(@request_hash)
-    @request = ActionController::CgiRequest.new(@fake_cgi)
+    @cgi = CGI.new
+    class << @cgi; attr_accessor :env_table end
+    @cgi.env_table = @request_hash
+    @request = ActionController::CgiRequest.new(@cgi)
   end
 
   def default_test; end
-end
 
+  private
+
+  def set_content_data(data)
+    @request.env['REQUEST_METHOD'] = 'POST'
+    @request.env['CONTENT_LENGTH'] = data.length
+    @request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
+    @request.env['RAW_POST_DATA'] = data
+  end
+end
 
 class CgiRequestTest < BaseCgiTest
   def test_proxy_request
@@ -26,7 +76,7 @@ class CgiRequestTest < BaseCgiTest
     assert_equal "rubyonrails.org:8080", @request.host_with_port
 
     @request_hash['HTTP_X_FORWARDED_HOST'] = "www.firsthost.org, www.secondhost.org"
-    assert_equal "www.secondhost.org", @request.host
+    assert_equal "www.secondhost.org", @request.host(true)
   end
 
   def test_http_host_with_default_port_overrides_server_port
@@ -71,6 +121,37 @@ class CgiRequestTest < BaseCgiTest
     assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
   end
 
+  def test_cgi_environment_variables
+    assert_equal "Basic", @request.auth_type
+    assert_equal 0, @request.content_length
+    assert_equal nil, @request.content_type
+    assert_equal "CGI/1.1", @request.gateway_interface
+    assert_equal "*/*", @request.accept
+    assert_equal "UTF-8", @request.accept_charset
+    assert_equal "gzip, deflate", @request.accept_encoding
+    assert_equal "en", @request.accept_language
+    assert_equal "no-cache, max-age=0", @request.cache_control
+    assert_equal "googlebot", @request.from
+    assert_equal "glu.ttono.us", @request.host
+    assert_equal "trans", @request.negotiate
+    assert_equal "no-cache", @request.pragma
+    assert_equal "http://www.google.com/search?q=glu.ttono.us", @request.referer
+    assert_equal "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en)", @request.user_agent
+    assert_equal "/homepage/", @request.path_info
+    assert_equal "/home/kevinc/sites/typo/public/homepage/", @request.path_translated
+    assert_equal "", @request.query_string
+    assert_equal "207.7.108.53", @request.remote_addr
+    assert_equal "google.com", @request.remote_host
+    assert_equal "kevin", @request.remote_ident
+    assert_equal "kevin", @request.remote_user
+    assert_equal :get, @request.request_method
+    assert_equal "/dispatch.fcgi", @request.script_name
+    assert_equal "glu.ttono.us:8007", @request.server_name
+    assert_equal 8007, @request.server_port
+    assert_equal "HTTP/1.1", @request.server_protocol
+    assert_equal "lighttpd", @request.server_software
+  end
+
   def test_cookie_syntax_resilience
     cookies = CGI::Cookie::parse(@request_hash["HTTP_COOKIE"]);
     assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"], cookies.inspect
@@ -82,13 +163,10 @@ class CgiRequestTest < BaseCgiTest
   end
 end
 
-
 class CgiRequestParamsParsingTest < BaseCgiTest
   def test_doesnt_break_when_content_type_has_charset
-    data = 'flamenco=love'
-    @request.env['CONTENT_LENGTH'] = data.length
-    @request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded; charset=utf-8'
-    @request.env['RAW_POST_DATA'] = data
+    set_content_data 'flamenco=love'
+
     assert_equal({"flamenco"=> "love"}, @request.request_parameters)
   end
 
@@ -98,6 +176,40 @@ class CgiRequestParamsParsingTest < BaseCgiTest
   end
 end
 
+class CgiRequestContentTypeTest < BaseCgiTest
+  def test_html_content_type_verification
+    @request.env['CONTENT_TYPE'] = Mime::HTML.to_s
+    assert @request.content_type.verify_request?
+  end
+
+  def test_xml_content_type_verification
+    @request.env['CONTENT_TYPE'] = Mime::XML.to_s
+    assert !@request.content_type.verify_request?
+  end
+end
+
+class CgiRequestMethodTest < BaseCgiTest
+  def test_get
+    assert_equal :get, @request.request_method
+  end
+
+  def test_post
+    @request.env['REQUEST_METHOD'] = 'POST'
+    assert_equal :post, @request.request_method
+  end
+
+  def test_put
+    set_content_data '_method=put'
+
+    assert_equal :put, @request.request_method
+  end
+
+  def test_delete
+    set_content_data '_method=delete'
+
+    assert_equal :delete, @request.request_method
+  end
+end
 
 class CgiRequestNeedsRewoundTest < BaseCgiTest
   def test_body_should_be_rewound
@@ -114,3 +226,38 @@ class CgiRequestNeedsRewoundTest < BaseCgiTest
     assert_equal 0, request.body.pos
   end
 end
+
+uses_mocha 'CGI Response' do
+  class CgiResponseTest < BaseCgiTest
+    def setup
+      super
+      @cgi.expects(:header).returns("HTTP/1.0 200 OK\nContent-Type: text/html\n")
+      @response = ActionController::CgiResponse.new(@cgi)
+      @output = StringIO.new('')
+    end
+
+    def test_simple_output
+      @response.body = "Hello, World!"
+
+      @response.out(@output)
+      assert_equal "HTTP/1.0 200 OK\nContent-Type: text/html\nHello, World!", @output.string
+    end
+
+    def test_head_request
+      @cgi.env_table['REQUEST_METHOD'] = 'HEAD'
+      @response.body = "Hello, World!"
+
+      @response.out(@output)
+      assert_equal "HTTP/1.0 200 OK\nContent-Type: text/html\n", @output.string
+    end
+
+    def test_streaming_block
+      @response.body = Proc.new do |response, output|
+        5.times { |n| output.write(n) }
+      end
+
+      @response.out(@output)
+      assert_equal "HTTP/1.0 200 OK\nContent-Type: text/html\n01234", @output.string
+    end
+  end
+end

data/test/controller/components_test.rb

@@ -77,49 +77,64 @@ class ComponentsTest < Test::Unit::TestCase
   end
 
   def test_calling_from_controller
-    get :calling_from_controller
-    assert_equal "Lady of the House, speaking", @response.body
+    assert_deprecated do
+      get :calling_from_controller
+      assert_equal "Lady of the House, speaking", @response.body
+    end
   end
 
   def test_calling_from_controller_with_params
-    get :calling_from_controller_with_params
-    assert_equal "David of the House, speaking", @response.body
+    assert_deprecated do
+      get :calling_from_controller_with_params
+      assert_equal "David of the House, speaking", @response.body
+    end
   end
 
   def test_calling_from_controller_with_different_status_code
-    get :calling_from_controller_with_different_status_code
-    assert_equal 500, @response.response_code
+    assert_deprecated do
+      get :calling_from_controller_with_different_status_code
+      assert_equal 500, @response.response_code
+    end
   end
 
   def test_calling_from_template
-    get :calling_from_template
-    assert_equal "Ring, ring: Lady of the House, speaking", @response.body
+    assert_deprecated do
+      get :calling_from_template
+      assert_equal "Ring, ring: Lady of the House, speaking", @response.body
+    end
   end
 
   def test_etag_is_set_for_parent_template_when_calling_from_template
-    get :calling_from_template
-    expected_etag = etag_for("Ring, ring: Lady of the House, speaking")
-    assert_equal expected_etag, @response.headers['ETag']
+    assert_deprecated do
+      get :calling_from_template
+      expected_etag = etag_for("Ring, ring: Lady of the House, speaking")
+      assert_equal expected_etag, @response.headers['ETag']
+    end
   end
 
   def test_internal_calling
-    get :internal_caller
-    assert_equal "Are you there? Yes, ma'am", @response.body
+    assert_deprecated do
+      get :internal_caller
+      assert_equal "Are you there? Yes, ma'am", @response.body
+    end
   end
 
   def test_flash
-    get :set_flash
-    assert_equal 'My stoney baby', flash[:notice]
-    get :use_flash
-    assert_equal 'My stoney baby', @response.body
-    get :use_flash
-    assert_equal 'no flash', @response.body
+    assert_deprecated do
+      get :set_flash
+      assert_equal 'My stoney baby', flash[:notice]
+      get :use_flash
+      assert_equal 'My stoney baby', @response.body
+      get :use_flash
+      assert_equal 'no flash', @response.body
+    end
   end
 
   def test_component_redirect_redirects
-    get :calling_redirected
-
-    assert_redirected_to :action => "being_called"
+    assert_deprecated do
+      get :calling_redirected
+      assert_redirected_to :controller=>"callee", :action => "being_called"
+    end
   end
 
   def test_component_multiple_redirect_redirects
@@ -128,9 +143,10 @@ class ComponentsTest < Test::Unit::TestCase
   end
 
   def test_component_as_string_redirect_renders_redirected_action
-    get :calling_redirected_as_string
-
-    assert_equal "Lady of the House, speaking", @response.body
+    assert_deprecated do
+      get :calling_redirected_as_string
+      assert_equal "Lady of the House, speaking", @response.body
+    end
   end
 
   protected

data/test/controller/content_type_test.rb

@@ -13,12 +13,17 @@ class ContentTypeController < ActionController::Base
   def render_content_type_from_render
     render :text => "hello world!", :content_type => Mime::RSS
   end
-  
+
   def render_charset_from_body
     response.charset = "utf-16"
     render :text => "hello world!"
   end
-  
+
+  def render_nil_charset_from_body
+    response.charset = nil
+    render :text => "hello world!"
+  end
+
   def render_default_for_rhtml
   end
 
@@ -45,8 +50,6 @@ class ContentTypeController < ActionController::Base
   def rescue_action(e) raise end
 end
 
-ContentTypeController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 class ContentTypeTest < Test::Unit::TestCase
   def setup
     @controller = ContentTypeController.new
@@ -68,7 +71,7 @@ class ContentTypeTest < Test::Unit::TestCase
   def test_render_changed_charset_default
     ContentTypeController.default_charset = "utf-16"
     get :render_defaults
-    assert_equal "utf-16", @response.charset    
+    assert_equal "utf-16", @response.charset
     assert_equal Mime::HTML, @response.content_type
     ContentTypeController.default_charset = "utf-8"
   end
@@ -76,63 +79,92 @@ class ContentTypeTest < Test::Unit::TestCase
   def test_content_type_from_body
     get :render_content_type_from_body
     assert_equal "application/rss+xml", @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
 
   def test_content_type_from_render
     get :render_content_type_from_render
     assert_equal "application/rss+xml", @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
 
   def test_charset_from_body
     get :render_charset_from_body
+    assert_equal Mime::HTML, @response.content_type
     assert_equal "utf-16", @response.charset
+  end
+
+  def test_nil_charset_from_body
+    get :render_nil_charset_from_body
+    assert_equal Mime::HTML, @response.content_type
+    assert_equal "utf-8", @response.charset, @response.headers.inspect
+  end
+
+  def test_nil_default_for_rhtml
+    ContentTypeController.default_charset = nil
+    get :render_default_for_rhtml
     assert_equal Mime::HTML, @response.content_type
+    assert_nil @response.charset, @response.headers.inspect
+  ensure
+    ContentTypeController.default_charset = "utf-8"
   end
 
   def test_default_for_rhtml
     get :render_default_for_rhtml
     assert_equal Mime::HTML, @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
 
   def test_default_for_rxml
     get :render_default_for_rxml
     assert_equal Mime::XML, @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
 
   def test_default_for_rjs
     xhr :post, :render_default_for_rjs
     assert_equal Mime::JS, @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
   end
 
   def test_change_for_rxml
     get :render_change_for_rxml
     assert_equal Mime::HTML, @response.content_type
-    assert_equal "utf-8", @response.charset    
+    assert_equal "utf-8", @response.charset
+  end
+end
+
+class AcceptBasedContentTypeTest < ActionController::TestCase
+
+  tests ContentTypeController
+
+  def setup
+    ActionController::Base.use_accept_header = true
+  end
+
+  def teardown
+    ActionController::Base.use_accept_header = false
   end
-  
+
+
   def test_render_default_content_types_for_respond_to
-    @request.env["HTTP_ACCEPT"] = Mime::HTML.to_s
+    @request.accept = Mime::HTML.to_s
     get :render_default_content_types_for_respond_to
     assert_equal Mime::HTML, @response.content_type
 
-    @request.env["HTTP_ACCEPT"] = Mime::JS.to_s
+    @request.accept = Mime::JS.to_s
     get :render_default_content_types_for_respond_to
     assert_equal Mime::JS, @response.content_type
   end
 
   def test_render_default_content_types_for_respond_to_with_template
-    @request.env["HTTP_ACCEPT"] = Mime::XML.to_s
+    @request.accept = Mime::XML.to_s
     get :render_default_content_types_for_respond_to
     assert_equal Mime::XML, @response.content_type
   end
-  
+
   def test_render_default_content_types_for_respond_to_with_overwrite
-    @request.env["HTTP_ACCEPT"] = Mime::RSS.to_s
+    @request.accept = Mime::RSS.to_s
     get :render_default_content_types_for_respond_to
     assert_equal Mime::XML, @response.content_type
   end