actionpack 1.12.5 → 1.13.0

data/test/controller/send_file_test.rb

@@ -63,6 +63,14 @@ class SendFileTest < Test::Unit::TestCase
     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"]
+
+    response = process('file')
+    assert_equal "application/octet-stream", response.headers["Content-Type"]
+  end
+
   # Test that send_file_headers! is setting the correct HTTP headers.
   def test_send_file_headers!
     options = {
@@ -97,7 +105,7 @@ class SendFileTest < Test::Unit::TestCase
     define_method "test_send_#{method}_status" do
       @controller.options = { :stream => false, :status => 500 }
       assert_nothing_raised { assert_not_nil process(method) }
-      assert_equal '500', @controller.headers['Status']
+      assert_equal '500 Internal Server Error', @controller.headers['Status']
     end
 
     define_method "test_default_send_#{method}_status" do

data/test/controller/session_management_test.rb

@@ -44,6 +44,49 @@ class SessionManagementTest < Test::Unit::TestCase
     end
   end
 
+  class AssociationCachingTestController < ActionController::Base
+    class ObjectWithAssociationCache
+      def initialize
+        @cached_associations = false
+      end
+
+      def fetch_associations
+        @cached_associations = true
+      end
+
+      def clear_association_cache
+        @cached_associations = false
+      end
+
+      def has_cached_associations?
+        @cached_associations
+      end
+    end
+
+    def show
+      session[:object] = ObjectWithAssociationCache.new
+      session[:object].fetch_associations
+      if session[:object].has_cached_associations?
+        render :text => "has cached associations"
+      else
+        render :text => "does not have cached associations"
+      end
+    end
+
+    def tell
+      if session[:object]
+        if session[:object].has_cached_associations?
+          render :text => "has cached associations"
+        else
+          render :text => "does not have cached associations"
+        end
+      else
+        render :text => "there is no object"
+      end
+    end
+  end
+
+
   def setup
     @request, @response = ActionController::TestRequest.new,
       ActionController::TestResponse.new
@@ -91,4 +134,12 @@ class SessionManagementTest < Test::Unit::TestCase
       assert_equal CGI::Session::ActiveRecordStore, ActionController::Base.session_store
     end
   end
+  
+  def test_process_cleanup_with_session_management_support
+    @controller = AssociationCachingTestController.new
+    get :show
+    assert_equal "has cached associations", @response.body
+    get :tell
+    assert_equal "does not have cached associations", @response.body
+  end
 end

data/test/controller/test_test.rb

@@ -15,8 +15,8 @@ class TestTest < Test::Unit::TestCase
 
     def test_params
       render :text => params.inspect
-    end                         
-    
+    end
+
     def test_uri
       render :text => request.request_uri
     end
@@ -41,7 +41,7 @@ class TestTest < Test::Unit::TestCase
 </html>
 HTML
     end
-    
+
     def test_only_one_param
       render :text => (params[:left] && params[:right]) ? "EEP, Both here!" : "OK"
     end
@@ -49,7 +49,7 @@ HTML
     def test_remote_addr
       render :text => (request.remote_addr || "not specified")
     end
-    
+
     def test_file_upload
       render :text => params[:file].size
     end
@@ -58,8 +58,20 @@ HTML
       redirect_to :generate_url, :id => 5
     end
 
+    def redirect_to_same_controller
+      redirect_to :controller => 'test', :action => 'test_uri', :id => 5
+    end
+
+    def redirect_to_different_controller
+      redirect_to :controller => 'fail', :id => 5
+    end
+
+    def create
+      headers['Location'] = 'created resource'
+      head :created
+    end
+
     private
-    
       def rescue_action(e)
         raise e
       end
@@ -74,6 +86,7 @@ HTML
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     ActionController::Routing::Routes.reload
+    ActionController::Routing.use_controllers! %w(content admin/user test_test/test)
   end
 
   def teardown
@@ -91,8 +104,8 @@ HTML
   def test_process_without_flash
     process :set_flash
     assert_equal '><', flash['test']
-  end          
-  
+  end
+
   def test_process_with_flash
     process :set_flash, nil, nil, { "test" => "value" }
     assert_equal '>value<', flash['test']
@@ -112,12 +125,12 @@ HTML
     @request.set_REQUEST_URI "/explicit/uri"
     process :test_uri, :id => 7
     assert_equal "/explicit/uri", @response.body
-  end                     
-  
-  def test_multiple_calls         
+  end
+
+  def test_multiple_calls
     process :test_only_one_param, :left => true
     assert_equal "OK", @response.body
-    process :test_only_one_param, :right => true  
+    process :test_only_one_param, :right => true
     assert_equal "OK", @response.body
   end
 
@@ -207,6 +220,8 @@ HTML
 
     # there is a tag with 2 children
     assert_tag :children => { :count => 2 }
+    # in particular, there is a <ul> tag with two children (a nameless pair of <li>s)
+    assert_tag :tag => 'ul', :children => { :count => 2 }
     # there is no tag with 4 children
     assert_no_tag :children => { :count => 4 }
   end
@@ -233,7 +248,7 @@ HTML
     process :test_html_output
 
     # there is a tag containing only one child with an id of 'foo'
-    assert_tag :children => { :count => 1, 
+    assert_tag :children => { :count => 1,
                               :only => { :attributes => { :id => "foo" } } }
     # there is no tag containing only one 'li' child
     assert_no_tag :children => { :count => 1, :only => { :tag => "li" } }
@@ -243,11 +258,11 @@ HTML
     process :test_html_output
 
     # the output contains the string "Name"
-    assert_tag :content => "Name"
+    assert_tag :content => /Name/
     # the output does not contain the string "test"
-    assert_no_tag :content => "test"
+    assert_no_tag :content => /test/
   end
-  
+
   def test_assert_tag_multiple
     process :test_html_output
 
@@ -267,7 +282,7 @@ HTML
 
   def test_assert_tag_children_without_content
     process :test_html_output
-    
+
     # there is a form tag with an 'input' child which is a self closing tag
     assert_tag :tag => "form",
       :children => { :count => 1,
@@ -281,8 +296,29 @@ HTML
             :only => { :tag => "img" } } } }
   end
 
+  def test_assert_tag_attribute_matching
+    @response.body = '<input type="text" name="my_name">'
+    assert_tag :tag => 'input',
+                 :attributes => { :name => /my/, :type => 'text' }
+    assert_no_tag :tag => 'input',
+                 :attributes => { :name => 'my', :type => 'text' }
+    assert_no_tag :tag => 'input',
+                 :attributes => { :name => /^my$/, :type => 'text' }
+  end
+
+  def test_assert_tag_content_matching
+    @response.body = "<p>hello world</p>"
+    assert_tag :tag => "p", :content => "hello world"
+    assert_tag :tag => "p", :content => /hello/
+    assert_no_tag :tag => "p", :content => "hello"
+  end
+
   def test_assert_generates
     assert_generates 'controller/action/5', :controller => 'controller', :action => 'action', :id => '5'
+    assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action"}
+    assert_generates 'controller/action/5', {:controller => "controller", :action => "action", :id => "5", :name => "bob"}, {}, {:name => "bob"}
+    assert_generates 'controller/action/7', {:id => "7", :name => "bob"}, {:controller => "controller", :action => "action"}, {:name => "bob"}
+    assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action", :name => "bob"}, {}
   end
 
   def test_assert_routing
@@ -310,11 +346,11 @@ HTML
 
   def test_array_path_parameter_handled_properly
     with_routing do |set|
-      set.draw do 
-        set.connect 'file/*path', :controller => 'test_test/test', :action => 'test_params'
-        set.connect ':controller/:action/:id'
+      set.draw do |map|
+        map.connect 'file/*path', :controller => 'test_test/test', :action => 'test_params'
+        map.connect ':controller/:action/:id'
       end
-      
+
       get :test_params, :path => ['hello', 'world']
       assert_equal ['hello', 'world'], @request.path_parameters['path']
       assert_equal 'hello/world', @request.path_parameters['path'].to_s
@@ -333,13 +369,13 @@ HTML
   def test_with_routing_places_routes_back
     assert ActionController::Routing::Routes
     routes_id = ActionController::Routing::Routes.object_id
-    
+
     begin
       with_routing { raise 'fail' }
       fail 'Should not be here.'
     rescue RuntimeError
     end
-    
+
     assert ActionController::Routing::Routes
     assert_equal routes_id, ActionController::Routing::Routes.object_id
   end
@@ -380,32 +416,80 @@ HTML
       end
     end
   end
-  
+
   FILES_DIR = File.dirname(__FILE__) + '/../fixtures/multipart'
-  
+
   def test_test_uploaded_file
     filename = 'mona_lisa.jpg'
     path = "#{FILES_DIR}/#{filename}"
     content_type = 'image/png'
-    
+
     file = ActionController::TestUploadedFile.new(path, content_type)
     assert_equal filename, file.original_filename
     assert_equal content_type, file.content_type
     assert_equal file.path, file.local_path
     assert_equal File.read(path), file.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
   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
-    get :redirect_to_symbol
-    assert_redirected_to :generate_url
+    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
+      assert_response :redirect
+      assert_redirected_to :controller => 'test_test/test', :action => 'test_uri', :id => 5
+      assert_nothing_raised { follow_redirect }
+    end
+  end
+
+  def test_assert_follow_redirect_to_different_controller
+    with_foo_routing do |set|
+      get :redirect_to_different_controller
+      assert_response :redirect
+      assert_redirected_to :controller => 'fail', :id => 5
+      assert_raise(RuntimeError) { follow_redirect }
+    end
   end
+
+  def test_redirect_url_only_cares_about_location_header
+    get :create
+    assert_response :created
+
+    # Redirect url doesn't care that it wasn't a :redirect response.
+    assert_equal 'created resource', @response.redirect_url
+    assert_equal @response.redirect_url, redirect_to_url
+
+    # Must be a :redirect response.
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_redirected_to 'created resource'
+    end
+  end
+
+  protected
+    def with_foo_routing
+      with_routing do |set|
+        set.draw do |map|
+          map.generate_url 'foo', :controller => 'test'
+          map.connect      ':controller/:action/:id'
+        end
+        yield set
+      end
+    end
 end

data/test/controller/url_rewriter_test.rb

@@ -6,23 +6,6 @@ class UrlRewriterTests < Test::Unit::TestCase
     @params = {}
     @rewriter = ActionController::UrlRewriter.new(@request, @params)
   end 
-  
-  def test_simple_build_query_string
-    assert_query_equal '?x=1&y=2', @rewriter.send(:build_query_string, :x => '1', :y => '2')
-  end
-  def test_convert_ints_build_query_string
-    assert_query_equal '?x=1&y=2', @rewriter.send(:build_query_string, :x => 1, :y => 2)
-  end
-  def test_escape_spaces_build_query_string
-    assert_query_equal '?x=hello+world&y=goodbye+world', @rewriter.send(:build_query_string, :x => 'hello world', :y => 'goodbye world')
-  end
-  def test_expand_array_build_query_string
-    assert_query_equal '?x[]=1&x[]=2', @rewriter.send(:build_query_string, :x => [1, 2])
-  end
-
-  def test_escape_spaces_build_query_string_selected_keys
-    assert_query_equal '?x=hello+world', @rewriter.send(:build_query_string, {:x => 'hello world', :y => 'goodbye world'}, [:x])
-  end
 
   def test_overwrite_params
     @params[:controller] = 'hi'
@@ -44,3 +27,89 @@ class UrlRewriterTests < Test::Unit::TestCase
       assert_equal(split_query_string(q1), split_query_string(q2))
     end
 end
+
+class UrlWriterTests < Test::Unit::TestCase
+  
+  class W
+    include ActionController::UrlWriter
+  end
+  
+  def teardown
+    W.default_url_options.clear
+  end
+  
+  def add_host!
+    W.default_url_options[:host] = 'www.basecamphq.com'
+  end
+  
+  def test_exception_is_thrown_without_host
+    assert_raises RuntimeError do
+      W.new.url_for :controller => 'c', :action => 'a', :id => 'i'
+    end
+  end
+  
+  def test_default_host
+    add_host!
+    assert_equal('http://www.basecamphq.com/c/a/i',
+      W.new.url_for(:controller => 'c', :action => 'a', :id => 'i')
+    )
+  end
+  
+  def test_host_may_be_overridden
+    add_host!
+    assert_equal('http://37signals.basecamphq.com/c/a/i',
+      W.new.url_for(:host => '37signals.basecamphq.com', :controller => 'c', :action => 'a', :id => 'i')
+    )
+  end
+  
+  def test_port
+    add_host!
+    assert_equal('http://www.basecamphq.com:3000/c/a/i',
+      W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :port => 3000)
+    )
+  end
+  
+  def test_protocol
+    add_host!
+    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.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
+      map.connect ':controller/:action/:id'
+    end
+    
+    # We need to create a new class in order to install the new named route.
+    kls = Class.new { include ActionController::UrlWriter }
+    controller = kls.new
+    assert controller.respond_to?(:home_url)
+    assert_equal 'http://www.basecamphq.com/home/sweet/home/again',
+      controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again')
+      
+    assert_equal("/home/sweet/home/alabama", controller.send(:home_path, :user => 'alabama', :host => 'unused'))
+  ensure
+    ActionController::Routing::Routes.load!
+  end
+  
+  def test_only_path
+    ActionController::Routing::Routes.draw do |map|
+      map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
+      map.connect ':controller/:action/:id'
+    end
+    
+    # We need to create a new class in order to install the new named route.
+    kls = Class.new { include ActionController::UrlWriter }
+    controller = kls.new
+    assert controller.respond_to?(:home_url)
+    assert_equal '/brave/new/world',
+      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))
+  ensure
+    ActionController::Routing::Routes.load!
+  end
+  
+end