actionpack 2.1.2 → 2.2.2

data/test/controller/logging_test.rb

@@ -0,0 +1,46 @@
+require 'abstract_unit'
+
+class LoggingController < ActionController::Base
+  def show
+    render :nothing => true
+  end
+end
+
+class LoggingTest < ActionController::TestCase
+  tests LoggingController
+
+  class MockLogger
+    attr_reader :logged
+    
+    def method_missing(method, *args)
+      @logged ||= []
+      @logged << args.first
+    end
+  end
+
+  setup :set_logger
+
+  def test_logging_without_parameters
+    get :show
+    assert_equal 2, logs.size
+    assert_nil logs.detect {|l| l =~ /Parameters/ }
+  end
+
+  def test_logging_with_parameters
+    get :show, :id => 10
+    assert_equal 3, logs.size
+
+    params = logs.detect {|l| l =~ /Parameters/ }
+    assert_equal 'Parameters: {"id"=>"10"}', params
+  end
+  
+  private
+
+  def set_logger
+    @controller.logger = MockLogger.new
+  end
+  
+  def logs
+    @logs ||= @controller.logger.logged.compact.map {|l| l.strip}
+  end
+end

data/test/controller/mime_responds_test.rb

@@ -107,7 +107,7 @@ class RespondToController < ActionController::Base
       type.any(:js, :xml) { render :text => "Either JS or XML" }
     end
   end
-  
+
   def handle_any_any
     respond_to do |type|
       type.html { render :text => 'HTML' }
@@ -120,12 +120,12 @@ class RespondToController < ActionController::Base
       type.html
       type.js
     end
-  end 
-  
-  def iphone_with_html_response_type 
+  end
+
+  def iphone_with_html_response_type
     Mime::Type.register_alias("text/html", :iphone)
     request.format = :iphone if request.env["HTTP_ACCEPT"] == "text/iphone"
-    
+
     respond_to do |type|
       type.html   { @type = "Firefox" }
       type.iphone { @type = "iPhone"  }
@@ -138,7 +138,7 @@ class RespondToController < ActionController::Base
   def iphone_with_html_response_type_without_layout
     Mime::Type.register_alias("text/html", :iphone)
     request.format = "iphone" if request.env["HTTP_ACCEPT"] == "text/iphone"
-    
+
     respond_to do |type|
       type.html   { @type = "Firefox"; render :action => "iphone_with_html_response_type" }
       type.iphone { @type = "iPhone" ; render :action => "iphone_with_html_response_type" }
@@ -162,10 +162,9 @@ class RespondToController < ActionController::Base
     end
 end
 
-RespondToController.view_paths = [ File.dirname(__FILE__) + "/../fixtures/" ]
-
 class MimeControllerTest < Test::Unit::TestCase
   def setup
+    ActionController::Base.use_accept_header = true
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
 
@@ -173,8 +172,12 @@ class MimeControllerTest < Test::Unit::TestCase
     @request.host = "www.example.com"
   end
 
+  def teardown
+    ActionController::Base.use_accept_header = false
+  end
+
   def test_html
-    @request.env["HTTP_ACCEPT"] = "text/html"
+    @request.accept = "text/html"
     get :js_or_html
     assert_equal 'HTML', @response.body
 
@@ -186,7 +189,7 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_all
-    @request.env["HTTP_ACCEPT"] = "*/*"
+    @request.accept = "*/*"
     get :js_or_html
     assert_equal 'HTML', @response.body # js is not part of all
 
@@ -198,13 +201,13 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_xml
-    @request.env["HTTP_ACCEPT"] = "application/xml"
+    @request.accept = "application/xml"
     get :html_xml_or_rss
     assert_equal 'XML', @response.body
   end
 
   def test_js_or_html
-    @request.env["HTTP_ACCEPT"] = "text/javascript, text/html"
+    @request.accept = "text/javascript, text/html"
     get :js_or_html
     assert_equal 'JS', @response.body
 
@@ -229,7 +232,7 @@ class MimeControllerTest < Test::Unit::TestCase
       'JSON' => %w(application/json text/x-json)
     }.each do |body, content_types|
       content_types.each do |content_type|
-        @request.env['HTTP_ACCEPT'] = content_type
+        @request.accept = content_type
         get :json_or_yaml
         assert_equal body, @response.body
       end
@@ -237,7 +240,7 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_js_or_anything
-    @request.env["HTTP_ACCEPT"] = "text/javascript, */*"
+    @request.accept = "text/javascript, */*"
     get :js_or_html
     assert_equal 'JS', @response.body
 
@@ -247,36 +250,36 @@ class MimeControllerTest < Test::Unit::TestCase
     get :just_xml
     assert_equal 'XML', @response.body
   end
-  
+
   def test_using_defaults
-    @request.env["HTTP_ACCEPT"] = "*/*"
+    @request.accept = "*/*"
     get :using_defaults
     assert_equal "text/html", @response.content_type
     assert_equal 'Hello world!', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.accept = "text/javascript"
     get :using_defaults
     assert_equal "text/javascript", @response.content_type
     assert_equal '$("body").visualEffect("highlight");', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "application/xml"
+    @request.accept = "application/xml"
     get :using_defaults
     assert_equal "application/xml", @response.content_type
     assert_equal "<p>Hello world!</p>\n", @response.body
   end
 
   def test_using_defaults_with_type_list
-    @request.env["HTTP_ACCEPT"] = "*/*"
+    @request.accept = "*/*"
     get :using_defaults_with_type_list
     assert_equal "text/html", @response.content_type
     assert_equal 'Hello world!', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.accept = "text/javascript"
     get :using_defaults_with_type_list
     assert_equal "text/javascript", @response.content_type
     assert_equal '$("body").visualEffect("highlight");', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "application/xml"
+    @request.accept = "application/xml"
     get :using_defaults_with_type_list
     assert_equal "application/xml", @response.content_type
     assert_equal "<p>Hello world!</p>\n", @response.body
@@ -295,90 +298,90 @@ class MimeControllerTest < Test::Unit::TestCase
   end
 
   def test_synonyms
-    @request.env["HTTP_ACCEPT"] = "application/javascript"
+    @request.accept = "application/javascript"
     get :js_or_html
     assert_equal 'JS', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "application/x-xml"
+    @request.accept = "application/x-xml"
     get :html_xml_or_rss
     assert_equal "XML", @response.body
   end
 
   def test_custom_types
-    @request.env["HTTP_ACCEPT"] = "application/crazy-xml"
+    @request.accept = "application/crazy-xml"
     get :custom_type_handling
     assert_equal "application/crazy-xml", @response.content_type
     assert_equal 'Crazy XML', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/html"
+    @request.accept = "text/html"
     get :custom_type_handling
     assert_equal "text/html", @response.content_type
     assert_equal 'HTML', @response.body
   end
 
   def test_xhtml_alias
-    @request.env["HTTP_ACCEPT"] = "application/xhtml+xml,application/xml"
+    @request.accept = "application/xhtml+xml,application/xml"
     get :html_or_xml
     assert_equal 'HTML', @response.body
   end
 
   def test_firefox_simulation
-    @request.env["HTTP_ACCEPT"] = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
+    @request.accept = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
     get :html_or_xml
     assert_equal 'HTML', @response.body
   end
 
   def test_handle_any
-    @request.env["HTTP_ACCEPT"] = "*/*"
+    @request.accept = "*/*"
     get :handle_any
     assert_equal 'HTML', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.accept = "text/javascript"
     get :handle_any
     assert_equal 'Either JS or XML', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/xml"
+    @request.accept = "text/xml"
     get :handle_any
     assert_equal 'Either JS or XML', @response.body
   end
 
   def test_handle_any_any
-    @request.env["HTTP_ACCEPT"] = "*/*"
+    @request.accept = "*/*"
     get :handle_any_any
     assert_equal 'HTML', @response.body
   end
-  
+
   def test_handle_any_any_parameter_format
     get :handle_any_any, {:format=>'html'}
     assert_equal 'HTML', @response.body
   end
-  
+
   def test_handle_any_any_explicit_html
-    @request.env["HTTP_ACCEPT"] = "text/html"
+    @request.accept = "text/html"
     get :handle_any_any
     assert_equal 'HTML', @response.body
   end
 
   def test_handle_any_any_javascript
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.accept = "text/javascript"
     get :handle_any_any
     assert_equal 'Whatever you ask for, I got it', @response.body
   end
-  
+
   def test_handle_any_any_xml
-    @request.env["HTTP_ACCEPT"] = "text/xml"
+    @request.accept = "text/xml"
     get :handle_any_any
     assert_equal 'Whatever you ask for, I got it', @response.body
   end
 
   def test_rjs_type_skips_layout
-    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    @request.accept = "text/javascript"
     get :all_types_with_layout
     assert_equal 'RJS for all_types_with_layout', @response.body
   end
 
   def test_html_type_with_layout
-    @request.env["HTTP_ACCEPT"] = "text/html"
+    @request.accept = "text/html"
     get :all_types_with_layout
     assert_equal '<html><div id="html">HTML for all_types_with_layout</div></html>', @response.body
   end
@@ -445,31 +448,31 @@ class MimeControllerTest < Test::Unit::TestCase
 
     get :using_defaults, :format => "xml"
     assert_equal "using_defaults - xml", @response.body
-  end 
-  
+  end
+
   def test_format_with_custom_response_type
     get :iphone_with_html_response_type
-    assert_equal '<html><div id="html">Hello future from Firefox!</div></html>', @response.body 
-    
+    assert_equal '<html><div id="html">Hello future from Firefox!</div></html>', @response.body
+
     get :iphone_with_html_response_type, :format => "iphone"
     assert_equal "text/html", @response.content_type
     assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @response.body
-  end 
-  
+  end
+
   def test_format_with_custom_response_type_and_request_headers
-    @request.env["HTTP_ACCEPT"] = "text/iphone"
+    @request.accept = "text/iphone"
     get :iphone_with_html_response_type
     assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @response.body
     assert_equal "text/html", @response.content_type
-  end 
+  end
 
   def test_format_with_custom_response_type_and_request_headers_with_only_one_layout_present
     get :iphone_with_html_response_type_without_layout
-    assert_equal '<html><div id="html_missing">Hello future from Firefox!</div></html>', @response.body 
+    assert_equal '<html><div id="html_missing">Hello future from Firefox!</div></html>', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/iphone"
+    @request.accept = "text/iphone"
     assert_raises(ActionView::MissingTemplate) { get :iphone_with_html_response_type_without_layout }
-  end 
+  end
 end
 
 class AbstractPostController < ActionController::Base
@@ -497,7 +500,7 @@ class PostController < AbstractPostController
     end
 end
 
-class SuperPostController < PostController  
+class SuperPostController < PostController
   def index
     respond_to do |type|
       type.html
@@ -514,25 +517,24 @@ class MimeControllerLayoutsTest < Test::Unit::TestCase
     @controller   = PostController.new
     @request.host = "www.example.com"
   end
-  
+
   def test_missing_layout_renders_properly
     get :index
-    assert_equal '<html><div id="html">Hello Firefox</div></html>', @response.body 
+    assert_equal '<html><div id="html">Hello Firefox</div></html>', @response.body
 
-    @request.env["HTTP_ACCEPT"] = "text/iphone"
+    @request.accept = "text/iphone"
     get :index
     assert_equal 'Hello iPhone', @response.body
   end
-  
+
   def test_format_with_inherited_layouts
     @controller = SuperPostController.new
-    
+
     get :index
     assert_equal 'Super Firefox', @response.body
-    
-    @request.env["HTTP_ACCEPT"] = "text/iphone"
+
+    @request.accept = "text/iphone"
     get :index
     assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body
   end
 end
-  

data/test/controller/mime_type_test.rb

@@ -61,7 +61,9 @@ class MimeTypeTest < Test::Unit::TestCase
     types.each do |type|
       mime = Mime.const_get(type.to_s.upcase)
       assert mime.send("#{type}?"), "#{mime.inspect} is not #{type}?"
-      (types - [type]).each { |other_type| assert !mime.send("#{other_type}?"), "#{mime.inspect} is #{other_type}?" }
+      invalid_types = types - [type]
+      invalid_types.delete(:html) if Mime::Type.html_types.include?(type)
+      invalid_types.each { |other_type| assert !mime.send("#{other_type}?"), "#{mime.inspect} is #{other_type}?" }
     end
   end
 
@@ -71,14 +73,12 @@ class MimeTypeTest < Test::Unit::TestCase
   end
 
   def test_verifiable_mime_types
-    unverified_types = Mime::Type.unverifiable_types
     all_types = Mime::SET.to_a.map(&:to_sym)
     all_types.uniq!
     # Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE
     all_types.delete_if { |type| !Mime.const_defined?(type.to_s.upcase) }
-
-    unverified, verified = all_types.partition { |type| Mime::Type.unverifiable_types.include? type }
-    assert verified.all?   { |type|  Mime.const_get(type.to_s.upcase).verify_request? }, "Not all Mime Types are verified: #{verified.inspect}"
-    assert unverified.all? { |type| !Mime.const_get(type.to_s.upcase).verify_request? }, "Some Mime Types are verified: #{unverified.inspect}"
+    verified, unverified = all_types.partition { |type| Mime::Type.browser_generated_types.include? type }
+    assert verified.each   { |type| assert  Mime.const_get(type.to_s.upcase).verify_request?, "Verifiable Mime Type is not verified: #{type.inspect}" }
+    assert unverified.each { |type| assert !Mime.const_get(type.to_s.upcase).verify_request?, "Nonverifiable Mime Type is verified: #{type.inspect}" }
   end
 end

data/test/controller/polymorphic_routes_test.rb

@@ -60,6 +60,18 @@ uses_mocha 'polymorphic URL helpers' do
       edit_polymorphic_url(@article)
     end
 
+    def test_url_helper_prefixed_with_edit_with_url_options
+      @article.save
+      expects(:edit_article_url).with(@article, :param1 => '10')
+      edit_polymorphic_url(@article, :param1 => '10')
+    end
+
+    def test_url_helper_with_url_options
+      @article.save
+      expects(:article_url).with(@article, :param1 => '10')
+      polymorphic_url(@article, :param1 => '10')
+    end
+
     def test_formatted_url_helper
       expects(:formatted_article_url).with(@article, :pdf)
       formatted_polymorphic_url([@article, :pdf])
@@ -67,10 +79,16 @@ uses_mocha 'polymorphic URL helpers' do
 
     def test_format_option
       @article.save
-      expects(:article_url).with(@article, :pdf)
+      expects(:formatted_article_url).with(@article, :pdf)
       polymorphic_url(@article, :format => :pdf)
     end
 
+    def test_format_option_with_url_options
+      @article.save
+      expects(:formatted_article_url).with(@article, :pdf, :param1 => '10')
+      polymorphic_url(@article, :format => :pdf, :param1 => '10')
+    end
+
     def test_id_and_format_option
       @article.save
       expects(:article_url).with(:id => @article, :format => :pdf)
@@ -147,10 +165,27 @@ uses_mocha 'polymorphic URL helpers' do
     def test_nesting_with_array_containing_singleton_resource_and_format_option
       @tag = Tag.new
       @tag.save
-      expects(:article_response_tag_url).with(@article, @tag, :pdf)
+      expects(:formatted_article_response_tag_url).with(@article, @tag, :pdf)
       polymorphic_url([@article, :response, @tag], :format => :pdf)
     end
 
+    def test_nesting_with_array_containing_nil
+      expects(:article_response_url).with(@article)
+      polymorphic_url([@article, nil, :response])
+    end
+
+    def test_with_array_containing_single_object
+      @article.save
+      expects(:article_url).with(@article)
+      polymorphic_url([nil, @article])
+    end
+
+    def test_with_array_containing_single_name
+      @article.save
+      expects(:articles_url)
+      polymorphic_url([:articles])
+    end
+
     # TODO: Needs to be updated to correctly know about whether the object is in a hash or not
     def xtest_with_hash
       expects(:article_url).with(@article)