actionpack 1.13.6 → 2.0.0

data/test/controller/session_fixation_test.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
 
+
 class SessionFixationTest < Test::Unit::TestCase
   class MockCGI < CGI #:nodoc:
     attr_accessor :stdoutput, :env_table
@@ -7,12 +8,12 @@ class SessionFixationTest < Test::Unit::TestCase
     def initialize(env, data = '')
       self.env_table = env
       self.stdoutput = StringIO.new
-      super(StringIO.new(data))
+      super(nil, StringIO.new(data))
     end
   end
 
   class TestController < ActionController::Base
-    session :session_key => '_myapp_session_id', :secret => 'secret', :except => :default_session_key
+    session :session_key => '_myapp_session_id', :secret => CGI::Session.generate_unique_id, :except => :default_session_key
     session :cookie_only => false, :only => :allow_session_fixation
 
     def default_session_key
@@ -38,7 +39,7 @@ class SessionFixationTest < Test::Unit::TestCase
     cgi = mock_cgi_for_request_to(:custom_session_key, :id => 1)
 
     assert_nothing_raised do
-      @controller.send(:process, mock_request(cgi), ActionController::CgiResponse.new(cgi))
+      @controller.send(:process, ActionController::CgiRequest.new(cgi, {}), ActionController::CgiResponse.new(cgi))
     end
     assert_equal 'custom_session_key: 1', @controller.response.body
     assert_not_nil @controller.session
@@ -48,7 +49,7 @@ class SessionFixationTest < Test::Unit::TestCase
     cgi = mock_cgi_for_request_to(:custom_session_key, :_myapp_session_id => 42)
 
     assert_raises ActionController::CgiRequest::SessionFixationAttempt do
-      @controller.send(:process, mock_request(cgi), ActionController::CgiResponse.new(cgi))
+      @controller.send(:process, ActionController::CgiRequest.new(cgi, {}), ActionController::CgiResponse.new(cgi))
     end
     assert_nil @controller.session
   end
@@ -57,9 +58,9 @@ class SessionFixationTest < Test::Unit::TestCase
     cgi = mock_cgi_for_request_to(:allow_session_fixation, :_myapp_session_id => 42)
 
     assert_nothing_raised do
-      @controller.send(:process, mock_request(cgi), ActionController::CgiResponse.new(cgi))
+      @controller.send(:process, ActionController::CgiRequest.new(cgi, {}), ActionController::CgiResponse.new(cgi))
     end
-    assert !@controller.response.body.blank?
+    assert ! @controller.response.body.blank?
     assert_not_nil @controller.session
   end
 
@@ -68,7 +69,7 @@ class SessionFixationTest < Test::Unit::TestCase
     cgi = mock_cgi_for_request_to(:default_session_key, :_session_id => 42)
 
     assert_raises ActionController::CgiRequest::SessionFixationAttempt do
-      @controller.send(:process, mock_request(cgi) , ActionController::CgiResponse.new(cgi))
+      @controller.send(:process, ActionController::CgiRequest.new(cgi, {}), ActionController::CgiResponse.new(cgi))
     end
     assert @controller.response.body.blank?
     assert_nil @controller.session
@@ -85,8 +86,4 @@ private
       "HTTP_HOST"      => "testdomain.com" }, '')
   end
 
-  def mock_request(cgi)
-    ActionController::CgiRequest.new(cgi, {})
-  end
-
 end

data/test/controller/session_management_test.rb

@@ -5,11 +5,11 @@ class SessionManagementTest < Test::Unit::TestCase
     session :off
 
     def show
-      render_text "done"
+      render :text => "done"
     end
 
     def tell
-      render_text "done"
+      render :text => "done"
     end
   end
 
@@ -20,15 +20,15 @@ class SessionManagementTest < Test::Unit::TestCase
             :if => Proc.new { |r| r.parameters[:ws] }
 
     def show
-      render_text "done"
+      render :text => "done"
     end
 
     def tell
-      render_text "done"
+      render :text => "done"
     end
 
     def conditional
-      render_text ">>>#{params[:ws]}<<<"
+      render :text => ">>>#{params[:ws]}<<<"
     end
   end
 
@@ -36,11 +36,11 @@ class SessionManagementTest < Test::Unit::TestCase
     session :disabled => false, :only => :something
 
     def something
-      render_text "done"
+      render :text => "done"
     end
 
     def another
-      render_text "done"
+      render :text => "done"
     end
   end
 

data/test/controller/test_test.rb

@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
-require File.dirname(__FILE__) + '/fake_controllers'
+require "#{File.dirname(__FILE__)}/../abstract_unit"
+require "#{File.dirname(__FILE__)}/fake_controllers"
+require "action_controller/test_case"
 
 class TestTest < Test::Unit::TestCase
   class TestController < ActionController::Base
@@ -13,6 +14,10 @@ class TestTest < Test::Unit::TestCase
       render :text => request.raw_post
     end
 
+    def render_body
+      render :text => request.body.read
+    end
+
     def test_params
       render :text => params.inspect
     end
@@ -21,6 +26,10 @@ class TestTest < Test::Unit::TestCase
       render :text => request.request_uri
     end
 
+    def test_query_string
+      render :text => request.query_string
+    end
+
     def test_html_output
       render :text => <<HTML
 <html>
@@ -41,6 +50,16 @@ class TestTest < Test::Unit::TestCase
 </html>
 HTML
     end
+    
+    def test_xml_output
+      response.content_type = "application/xml"
+      render :text => <<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <area>area is an empty tag in HTML, raising an error if not in xml mode</area>
+</root>
+XML
+    end
 
     def test_only_one_param
       render :text => (params[:left] && params[:right]) ? "EEP, Both here!" : "OK"
@@ -54,8 +73,8 @@ HTML
       render :text => params[:file].size
     end
 
-    def redirect_to_symbol
-      redirect_to :generate_url, :id => 5
+    def test_send_file
+      send_file(File.expand_path(__FILE__))
     end
 
     def redirect_to_same_controller
@@ -67,8 +86,7 @@ HTML
     end
 
     def create
-      headers['Location'] = 'created resource'
-      head :created
+      head :created, :location => 'created resource'
     end
 
     private
@@ -95,10 +113,17 @@ HTML
 
   def test_raw_post_handling
     params = {:page => {:name => 'page name'}, 'some key' => 123}
-    get :render_raw_post, params.dup
+    post :render_raw_post, params.dup
 
-    raw_post = params.map {|k,v| [CGI::escape(k.to_s), CGI::escape(v.to_s)].join('=')}.sort.join('&')
-    assert_equal raw_post, @response.body
+    assert_equal params.to_query, @response.body
+  end
+
+  def test_body_stream
+    params = { :page => { :name => 'page name' }, 'some key' => 123 }
+
+    post :render_body, params.dup
+
+    assert_equal params.to_query, @response.body
   end
 
   def test_process_without_flash
@@ -127,6 +152,17 @@ HTML
     assert_equal "/explicit/uri", @response.body
   end
 
+  def test_process_with_query_string
+    process :test_query_string, :q => 'test'
+    assert_equal "q=test", @response.body
+  end
+
+  def test_process_with_query_string_with_explicit_uri
+    @request.set_REQUEST_URI "/explicit/uri?q=test?extra=question"
+    process :test_query_string
+    assert_equal "q=test?extra=question", @response.body
+  end
+
   def test_multiple_calls
     process :test_only_one_param, :left => true
     assert_equal "OK", @response.body
@@ -182,7 +218,7 @@ HTML
   def test_assert_tag_descendant
     process :test_html_output
 
-    # there is a tag with a decendant 'li' tag
+    # there is a tag with a descendant 'li' tag
     assert_tag :descendant => { :tag => "li" }
     # there is no tag with a descendant 'html' tag
     assert_no_tag :descendant => { :tag => "html" }
@@ -209,9 +245,9 @@ HTML
   def test_assert_tag_before
     process :test_html_output
 
-    # there is a tag preceeding a tag with id 'bar'
+    # there is a tag preceding a tag with id 'bar'
     assert_tag :before => { :attributes => { :id => "bar" } }
-    # there is no tag preceeding a 'form' tag
+    # there is no tag preceding a 'form' tag
     assert_no_tag :before => { :tag => "form" }
   end
 
@@ -295,6 +331,20 @@ HTML
           :children => { :count => 1,
             :only => { :tag => "img" } } } }
   end
+  
+  def test_should_not_impose_childless_html_tags_in_xml
+    process :test_xml_output
+
+    begin
+      $stderr = StringIO.new
+      assert_select 'area' #This will cause a warning if content is processed as HTML
+      $stderr.rewind && err = $stderr.read
+    ensure
+      $stderr = STDERR
+    end
+
+    assert err.empty?
+  end
 
   def test_assert_tag_attribute_matching
     @response.body = '<input type="text" name="my_name">'
@@ -430,26 +480,40 @@ HTML
     assert_equal file.path, file.local_path
     assert_equal File.read(path), file.read
   end
+  
+  def test_test_uploaded_file_with_binary
+    filename = 'mona_lisa.jpg'
+    path = "#{FILES_DIR}/#{filename}"
+    content_type = 'image/png'
+    
+    binary_uploaded_file = ActionController::TestUploadedFile.new(path, content_type, :binary)
+    assert_equal File.open(path, 'rb').read, binary_uploaded_file.read
+    
+    plain_uploaded_file = ActionController::TestUploadedFile.new(path, content_type)
+    assert_equal File.open(path, 'r').read, plain_uploaded_file.read
+  end
+
+  def test_fixture_file_upload_with_binary
+    filename = 'mona_lisa.jpg'
+    path = "#{FILES_DIR}/#{filename}"
+    content_type = 'image/jpg'
+    
+    binary_file_upload = fixture_file_upload(path, content_type, :binary)
+    assert_equal File.open(path, 'rb').read, binary_file_upload.read
+    
+    plain_file_upload = fixture_file_upload(path, content_type)
+    assert_equal File.open(path, 'r').read, plain_file_upload.read
+  end
 
   def test_fixture_file_upload
     post :test_file_upload, :file => fixture_file_upload(FILES_DIR + "/mona_lisa.jpg", "image/jpg")
-    assert_equal 159528, @response.body
+    assert_equal '159528', @response.body
   end
 
   def test_test_uploaded_file_exception_when_file_doesnt_exist
     assert_raise(RuntimeError) { ActionController::TestUploadedFile.new('non_existent_file') }
   end
 
-  def test_assert_redirected_to_symbol
-    with_foo_routing do |set|
-      assert_deprecated(/generate_url.*redirect_to/) do
-        get :redirect_to_symbol
-      end
-      assert_response :redirect
-      assert_redirected_to :generate_url
-    end
-  end
-
   def test_assert_follow_redirect_to_same_controller
     with_foo_routing do |set|
       get :redirect_to_same_controller
@@ -482,22 +546,11 @@ HTML
     end
   end
 
-  def test_request_uri_updates
-    get :test_params
-    uri = @request.request_uri
-    assert_equal @request.env['REQUEST_URI'], uri
-    
-    get :test_uri
-    assert_not_equal uri, @request.request_uri
-    uri = @request.request_uri
-    assert_equal @request.env['REQUEST_URI'], uri
-
-    get :test_uri, :testing => true
-    assert_not_equal uri, @request.request_uri
-    uri = @request.request_uri
-    assert_equal @request.env['REQUEST_URI'], uri
+  def test_binary_content_works_with_send_file
+    get :test_send_file
+    assert_nothing_raised(NoMethodError) { @response.binary_content }
   end
-
+  
   protected
     def with_foo_routing
       with_routing do |set|
@@ -509,3 +562,62 @@ HTML
       end
     end
 end
+
+
+class CleanBacktraceTest < Test::Unit::TestCase
+  def test_should_reraise_the_same_object
+    exception = Test::Unit::AssertionFailedError.new('message')
+    clean_backtrace { raise exception }
+  rescue => caught
+    assert_equal exception.object_id, caught.object_id
+    assert_equal exception.message, caught.message
+  end
+
+  def test_should_clean_assertion_lines_from_backtrace
+    path = File.expand_path("#{File.dirname(__FILE__)}/../../lib/action_controller")
+    exception = Test::Unit::AssertionFailedError.new('message')
+    exception.set_backtrace ["#{path}/abc", "#{path}/assertions/def"]
+    clean_backtrace { raise exception }
+  rescue => caught
+    assert_equal ["#{path}/abc"], caught.backtrace
+  end
+
+  def test_should_only_clean_assertion_failure_errors
+    clean_backtrace do
+      raise "can't touch this", [File.expand_path("#{File.dirname(__FILE__)}/../../lib/action_controller/assertions/abc")]
+    end
+  rescue => caught
+    assert !caught.backtrace.empty?
+  end
+end
+
+class InferringClassNameTest < Test::Unit::TestCase
+  def test_determine_controller_class
+    assert_equal ContentController, determine_class("ContentControllerTest")
+  end
+
+  def test_determine_controller_class_with_nonsense_name
+    assert_raises ActionController::NonInferrableControllerError do
+      determine_class("HelloGoodBye")
+    end
+  end
+
+  def test_determine_controller_class_with_sensible_name_where_no_controller_exists
+    assert_raises ActionController::NonInferrableControllerError do
+      determine_class("NoControllerWithThisNameTest")
+    end
+  end
+
+  private
+    def determine_class(name)
+      ActionController::TestCase.determine_default_controller_class(name)
+    end
+end
+
+class CrazyNameTest < ActionController::TestCase
+  tests ContentController
+  def test_controller_class_can_be_set_manually_not_just_inferred
+    assert_equal ContentController, self.class.controller_class
+  end
+end
+

data/test/controller/url_rewriter_test.rb

@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
 
+ActionController::UrlRewriter
+
 class UrlRewriterTests < Test::Unit::TestCase
   def setup
     @request = ActionController::TestRequest.new
@@ -7,6 +9,43 @@ class UrlRewriterTests < Test::Unit::TestCase
     @rewriter = ActionController::UrlRewriter.new(@request, @params)
   end 
 
+  def test_port
+    assert_equal('http://test.host:1271/c/a/i',
+      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :port => 1271)
+    )
+  end
+
+  def test_protocol_with_and_without_separator
+    assert_equal('https://test.host/c/a/i',
+      @rewriter.rewrite(:protocol => 'https', :controller => 'c', :action => 'a', :id => 'i')
+    )
+
+    assert_equal('https://test.host/c/a/i',
+      @rewriter.rewrite(:protocol => 'https://', :controller => 'c', :action => 'a', :id => 'i')
+    )
+  end
+  
+  def test_user_name_and_password
+    assert_equal(
+      'http://david:secret@test.host/c/a/i',
+      @rewriter.rewrite(:user => "david", :password => "secret", :controller => 'c', :action => 'a', :id => 'i')
+    )
+  end
+
+  def test_user_name_and_password_with_escape_codes
+    assert_equal(
+      'http://openid.aol.com%2Fnextangler:one+two%3F@test.host/c/a/i',
+      @rewriter.rewrite(:user => "openid.aol.com/nextangler", :password => "one two?", :controller => 'c', :action => 'a', :id => 'i')
+    )
+  end
+  
+  def test_anchor 
+    assert_equal( 
+      'http://test.host/c/a/i#anchor', 
+      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor') 
+    ) 
+  end
+
   def test_overwrite_params
     @params[:controller] = 'hi'
     @params[:action] = 'bye'
@@ -17,11 +56,32 @@ class UrlRewriterTests < Test::Unit::TestCase
     assert_match %r(/hi/hi/2$), u
   end
   
-  def test_anchor
-    assert_equal(
-      'http://test.host/c/a/i#anchor',
-      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor')
-    )
+  def test_overwrite_removes_original
+    @params[:controller] = 'search'
+    @params[:action] = 'list'
+    @params[:list_page] = 1
+    
+    assert_equal '/search/list?list_page=2', @rewriter.rewrite(:only_path => true, :overwrite_params => {"list_page" => 2})
+    u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:list_page => 2})
+    assert_equal 'http://test.host/search/list?list_page=2', u
+  end
+
+  def test_to_str
+    @params[:controller] = 'hi'
+    @params[:action] = 'bye'
+    @request.parameters[:id] = '2'
+
+    assert_equal 'http://, test.host, /, hi, bye, {"id"=>"2"}', @rewriter.to_str
+  end
+
+  def test_trailing_slash
+    options = {:controller => 'foo', :action => 'bar', :id => '3', :only_path => true}
+    assert_equal '/foo/bar/3', @rewriter.rewrite(options)
+    assert_equal '/foo/bar/3?query=string', @rewriter.rewrite(options.merge({:query => 'string'}))
+    options.update({:trailing_slash => true})
+    assert_equal '/foo/bar/3/', @rewriter.rewrite(options)
+    options.update({:query => 'string'})
+    assert_equal '/foo/bar/3/?query=string', @rewriter.rewrite(options)
   end
 end
 
@@ -44,6 +104,12 @@ class UrlWriterTests < Test::Unit::TestCase
       W.new.url_for :controller => 'c', :action => 'a', :id => 'i'
     end
   end
+
+  def test_anchor
+    assert_equal('/c/a#anchor',
+      W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => 'anchor')
+    )
+  end
   
   def test_default_host
     add_host!
@@ -72,15 +138,20 @@ class UrlWriterTests < Test::Unit::TestCase
       W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https')
     )
   end
-
-  def test_anchor
-    assert_equal('/c/a#anchor',
-      W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => 'anchor')
+  
+  def test_protocol_with_and_without_separator
+    add_host!
+    assert_equal('https://www.basecamphq.com/c/a/i',
+      W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https')
+    )
+    assert_equal('https://www.basecamphq.com/c/a/i',
+      W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https://')
     )
   end
-  
+
   def test_named_route
     ActionController::Routing::Routes.draw do |map|
+      map.no_args '/this/is/verbose', :controller => 'home', :action => 'index'
       map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
       map.connect ':controller/:action/:id'
     end
@@ -93,6 +164,8 @@ class UrlWriterTests < Test::Unit::TestCase
       controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again')
       
     assert_equal("/home/sweet/home/alabama", controller.send(:home_path, :user => 'alabama', :host => 'unused'))
+    assert_equal("http://www.basecamphq.com/home/sweet/home/alabama", controller.send(:home_url, :user => 'alabama', :host => 'www.basecamphq.com'))
+    assert_equal("http://www.basecamphq.com/this/is/verbose", controller.send(:no_args_url, :host=>'www.basecamphq.com'))
   ensure
     ActionController::Routing::Routes.load!
   end
@@ -111,6 +184,7 @@ class UrlWriterTests < Test::Unit::TestCase
       controller.send(:url_for, :controller => 'brave', :action => 'new', :id => 'world', :only_path => true)
     
     assert_equal("/home/sweet/home/alabama", controller.send(:home_url, :user => 'alabama', :host => 'unused', :only_path => true))
+    assert_equal("/home/sweet/home/alabama", controller.send(:home_path, 'alabama'))
   ensure
     ActionController::Routing::Routes.load!
   end
@@ -156,8 +230,8 @@ class UrlWriterTests < Test::Unit::TestCase
     params = extract_params(url)
     assert_equal params[0], { 'query[hobby]'              => 'piercing'     }.to_query
     assert_equal params[1], { 'query[person][name]'       => 'Bob'          }.to_query
-    assert_equal params[2], { 'query[person][position][]' => 'art director' }.to_query
-    assert_equal params[3], { 'query[person][position][]' => 'prof'         }.to_query
+    assert_equal params[2], { 'query[person][position][]' => 'prof'         }.to_query
+    assert_equal params[3], { 'query[person][position][]' => 'art director' }.to_query
   end
 
   def test_path_generation_for_symbol_parameter_keys
@@ -168,4 +242,5 @@ class UrlWriterTests < Test::Unit::TestCase
     def extract_params(url)
       url.split('?', 2).last.split('&')
     end
+
 end