actionpack 1.12.5 → 1.13.0

data/test/controller/flash_test.rb

@@ -35,6 +35,16 @@ class FlashTest < Test::Unit::TestCase
       render :inline => "hello"
     end
 
+    def use_flash_after_reset_session
+      flash["that"] = "hello"
+      @flashy_that = flash["that"]
+      reset_session
+      @flashy_that_reset = flash["that"]
+      flash["this"] = "good-bye"
+      @flashy_this = flash["this"]
+      render :inline => "hello"
+    end
+
     def rescue_action(e)
       raise unless ActionController::MissingTemplate === e
     end
@@ -60,7 +70,7 @@ class FlashTest < Test::Unit::TestCase
   def test_keep_flash
     get :set_flash
     
-    get :use_flash_and_keep_it
+    assert_deprecated(/keep_flash/) { get :use_flash_and_keep_it }
     assert_equal "hello", @response.template.assigns["flash_copy"]["that"]
     assert_equal "hello", @response.template.assigns["flashy"]
 
@@ -82,4 +92,11 @@ class FlashTest < Test::Unit::TestCase
     assert_nil @response.template.assigns["flash_copy"]["foo"]
     assert_nil @response.template.assigns["flashy"]
   end 
-end
+  
+  def test_flash_after_reset_session
+    get :use_flash_after_reset_session
+    assert_equal "hello",    @response.template.assigns["flashy_that"]
+    assert_equal "good-bye", @response.template.assigns["flashy_this"]
+    assert_nil   @response.template.assigns["flashy_that_reset"]
+  end 
+end

data/test/controller/helper_test.rb

@@ -77,8 +77,8 @@ class HelperTest < Test::Unit::TestCase
 
   def test_declare_missing_file_from_helper
     require 'broken_helper'
-    rescue LoadError => e
-      assert_nil /\bbroken_helper\b/.match(e.to_s)[1]
+  rescue LoadError => e
+    assert_nil(/\bbroken_helper\b/.match(e.to_s)[1])
   end
 
   def test_helper_block

data/test/controller/integration_test.rb

@@ -0,0 +1,154 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+$:.unshift File.dirname(__FILE__) + '/../../../railties/lib'
+require 'action_controller/integration'
+
+begin # rescue LoadError
+require 'mocha'
+require 'stubba'
+
+# Stub process for testing.
+module ActionController
+  module Integration
+    class Session
+      def process
+      end
+
+      def generic_url_rewriter
+      end
+    end
+  end
+end
+
+class SessionTest < Test::Unit::TestCase
+  def setup
+    @session = ActionController::Integration::Session.new
+  end
+  def test_https_bang_works_and_sets_truth_by_default
+    assert !@session.https?
+    @session.https!
+    assert @session.https?
+    @session.https! false
+    assert !@session.https?
+  end
+
+  def test_host!
+    assert_not_equal "glu.ttono.us", @session.host
+    @session.host! "rubyonrails.com"
+    assert_equal "rubyonrails.com", @session.host
+  end
+
+  def test_follow_redirect_raises_when_no_redirect
+    @session.stubs(:redirect?).returns(false)
+    assert_raise(RuntimeError) { @session.follow_redirect! }
+  end
+
+  def test_follow_redirect_calls_get_and_returns_status
+    @session.stubs(:redirect?).returns(true)
+    @session.stubs(:headers).returns({"location" => ["www.google.com"]})
+    @session.stubs(:status).returns(200)
+    @session.expects(:get)
+    assert_equal 200, @session.follow_redirect!
+  end
+
+  def test_get_via_redirect
+    path = "/somepath"; args = {:id => '1'}
+
+    @session.expects(:get).with(path,args)
+
+    redirects = [true, true, false]
+    @session.stubs(:redirect?).returns(lambda { redirects.shift })
+    @session.expects(:follow_redirect!).times(2)
+
+    @session.stubs(:status).returns(200)
+    assert_equal 200, @session.get_via_redirect(path, args)
+  end
+
+  def test_post_via_redirect
+    path = "/somepath"; args = {:id => '1'}
+
+    @session.expects(:post).with(path,args)
+
+    redirects = [true, true, false]
+    @session.stubs(:redirect?).returns(lambda { redirects.shift })
+    @session.expects(:follow_redirect!).times(2)
+
+    @session.stubs(:status).returns(200)
+    assert_equal 200, @session.post_via_redirect(path, args)
+  end
+
+  def test_url_for_with_controller
+    options = {:action => 'show'}
+    mock_controller = mock()
+    mock_controller.expects(:url_for).with(options).returns('/show')
+    @session.stubs(:controller).returns(mock_controller)
+    assert_equal '/show', @session.url_for(options)
+  end
+
+  def test_url_for_without_controller
+    options = {:action => 'show'}
+    mock_rewriter = mock()
+    mock_rewriter.expects(:rewrite).with(options).returns('/show')
+    @session.stubs(:generic_url_rewriter).returns(mock_rewriter)
+    @session.stubs(:controller).returns(nil)
+    assert_equal '/show', @session.url_for(options)
+  end
+
+  def test_redirect_bool_with_status_in_300s
+    @session.stubs(:status).returns 301
+    assert @session.redirect?
+  end
+
+  def test_redirect_bool_with_status_in_200s
+    @session.stubs(:status).returns 200
+    assert !@session.redirect?
+  end
+
+  def test_get
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    @session.expects(:process).with(:get,path,params,headers)
+    @session.get(path,params,headers)
+  end
+
+  def test_post
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    @session.expects(:process).with(:post,path,params,headers)
+    @session.post(path,params,headers)
+  end
+
+  def test_put
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    @session.expects(:process).with(:put,path,params,headers)
+    @session.put(path,params,headers)
+  end
+
+  def test_delete
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    @session.expects(:process).with(:delete,path,params,headers)
+    @session.delete(path,params,headers)
+  end
+
+  def test_head
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    @session.expects(:process).with(:head,path,params,headers)
+    @session.head(path,params,headers)
+  end
+
+  def test_xml_http_request
+    path = "/index"; params = "blah"; headers = {:location => 'blah'}
+    headers_after_xhr = headers.merge(
+      "X-Requested-With" => "XMLHttpRequest",
+      "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
+    )
+    @session.expects(:post).with(path,params,headers_after_xhr)
+    @session.xml_http_request(path,params,headers)
+  end
+end
+
+# TODO
+# class MockCGITest < Test::Unit::TestCase
+# end
+
+rescue LoadError
+  $stderr.puts "Skipping integration tests. `gem install mocha` and try again."
+end

data/test/controller/layout_test.rb

@@ -70,4 +70,118 @@ class LayoutAutoDiscoveryTest < Test::Unit::TestCase
     assert_equal 'layouts/controller_name_space/nested', @controller.active_layout
     assert_equal 'controller_name_space/nested.rhtml hello.rhtml', @response.body
   end
-end
+end
+
+class ExemptFromLayoutTest < Test::Unit::TestCase
+  def setup
+    @controller = LayoutTest.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_rjs_exempt_from_layout
+    assert @controller.send(:template_exempt_from_layout?, 'test.rjs')
+  end
+
+  def test_rhtml_and_rxml_not_exempt_from_layout
+    assert !@controller.send(:template_exempt_from_layout?, 'test.rhtml')
+    assert !@controller.send(:template_exempt_from_layout?, 'test.rxml')
+  end
+
+  def test_other_extension_not_exempt_from_layout
+    assert !@controller.send(:template_exempt_from_layout?, 'test.random')
+  end
+
+  def test_add_extension_to_exempt_from_layout
+    ['rpdf', :rpdf].each do |ext|
+      assert_nothing_raised do
+        ActionController::Base.exempt_from_layout ext
+      end
+      assert @controller.send(:template_exempt_from_layout?, "test.#{ext}")
+    end
+  end
+
+  def test_add_regexp_to_exempt_from_layout
+    ActionController::Base.exempt_from_layout /\.rdoc/
+    assert @controller.send(:template_exempt_from_layout?, 'test.rdoc')
+  end
+
+  def test_rhtml_exempt_from_layout_status_should_prevent_layout_render
+    ActionController::Base.exempt_from_layout :rhtml
+    assert @controller.send(:template_exempt_from_layout?, 'test.rhtml')
+
+    get :hello
+    assert_equal 'hello.rhtml', @response.body
+    ActionController::Base.exempt_from_layout.delete(/\.rhtml$/)
+  end
+end
+
+
+class DefaultLayoutController < LayoutTest
+end
+
+class HasOwnLayoutController < LayoutTest
+  layout 'item'
+end
+
+class SetsLayoutInRenderController < LayoutTest
+  def hello
+    render :layout => 'third_party_template_library'
+  end
+end
+
+class RendersNoLayoutController < LayoutTest
+  def hello
+    render :layout => false
+  end
+end
+
+class LayoutSetInResponseTest < Test::Unit::TestCase
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_layout_set_when_using_default_layout
+    @controller = DefaultLayoutController.new
+    get :hello
+    assert_equal 'layouts/layout_test', @response.layout
+  end
+  
+  def test_layout_set_when_set_in_controller
+    @controller = HasOwnLayoutController.new
+    get :hello
+    assert_equal 'layouts/item', @response.layout
+  end
+  
+  def test_layout_set_when_using_render
+    @controller = SetsLayoutInRenderController.new
+    get :hello
+    assert_equal 'layouts/third_party_template_library', @response.layout
+  end
+  
+  def test_layout_is_not_set_when_none_rendered
+    @controller = RendersNoLayoutController.new
+    get :hello
+    assert_nil @response.layout
+  end
+end
+
+
+class SetsNonExistentLayoutFile < LayoutTest
+  layout "nofile.rhtml"
+end
+
+class LayoutExceptionRaised < Test::Unit::TestCase
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_exception_raised_when_layout_file_not_found
+    @controller = SetsNonExistentLayoutFile.new
+    get :hello
+    @response.template.class.module_eval { attr_accessor :exception }
+    assert_equal ActionController::MissingTemplate, @response.template.exception.class
+  end
+end

data/test/controller/mime_responds_test.rb

@@ -20,6 +20,13 @@ class RespondToController < ActionController::Base
     end
   end
 
+  def json_or_yaml
+    respond_to do |type|
+      type.json { render :text => "JSON" }
+      type.yaml { render :text => "YAML" }
+    end
+  end
+
   def html_or_xml
     respond_to do |type|
       type.html { render :text => "HTML"    }
@@ -61,6 +68,29 @@ class RespondToController < ActionController::Base
       type.all  { render :text => "Nothing" }
     end
   end
+  
+  def custom_constant_handling
+    Mime::Type.register("text/x-mobile", :mobile)
+
+    respond_to do |type|
+      type.html   { render :text => "HTML"   }
+      type.mobile { render :text => "Mobile" }
+    end
+    
+    Mime.send :remove_const, :MOBILE
+  end
+  
+  def custom_constant_handling_without_block
+    Mime::Type.register("text/x-mobile", :mobile)
+
+    respond_to do |type|
+      type.html   { render :text => "HTML"   }
+      type.mobile
+    end
+    
+    Mime.send :remove_const, :MOBILE    
+  end
+  
 
   def handle_any
     respond_to do |type|
@@ -141,6 +171,27 @@ class MimeControllerTest < Test::Unit::TestCase
     assert_response 406
   end
 
+  def test_json_or_yaml
+    get :json_or_yaml
+    assert_equal 'JSON', @response.body
+
+    get :json_or_yaml, :format => 'json'
+    assert_equal 'JSON', @response.body
+
+    get :json_or_yaml, :format => 'yaml'
+    assert_equal 'YAML', @response.body
+
+    { 'YAML' => %w(text/yaml),
+      'JSON' => %w(application/json text/x-json)
+    }.each do |body, content_types|
+      content_types.each do |content_type|
+        @request.env['HTTP_ACCEPT'] = content_type
+        get :json_or_yaml
+        assert_equal body, @response.body
+      end
+    end
+  end
+
   def test_js_or_anything
     @request.env["HTTP_ACCEPT"] = "text/javascript, */*"
     get :js_or_html
@@ -254,4 +305,47 @@ class MimeControllerTest < Test::Unit::TestCase
     xhr :get, :using_defaults
     assert_equal '$("body").visualEffect("highlight");', @response.body
   end
+  
+  def test_custom_constant
+    get :custom_constant_handling, :format => "mobile"
+    assert_equal "Mobile", @response.body
+  end
+  
+  def custom_constant_handling_without_block
+    
+    assert_raised(ActionController::RenderError) do
+      get :custom_constant_handling, :format => "mobile"
+    end
+  end
+  
+  def test_forced_format
+    get :html_xml_or_rss
+    assert_equal "HTML", @response.body
+
+    get :html_xml_or_rss, :format => "html"
+    assert_equal "HTML", @response.body
+
+    get :html_xml_or_rss, :format => "xml"
+    assert_equal "XML", @response.body
+
+    get :html_xml_or_rss, :format => "rss"
+    assert_equal "RSS", @response.body
+  end
+
+  def test_render_action_for_html
+    @controller.instance_eval do
+      def render(*args)
+        unless args.empty?
+          @action = args.first[:action]
+        end
+        response.body = @action
+      end
+    end
+
+    get :using_defaults
+    assert_equal "using_defaults", @response.body
+
+    get :using_defaults, :format => "xml"
+    assert_equal "using_defaults.rxml", @response.body
+  end
 end

data/test/controller/mime_type_test.rb

@@ -21,4 +21,13 @@ class MimeTypeTest < Test::Unit::TestCase
     expect = [Mime::HTML, Mime::XML, Mime::PNG, Mime::PLAIN, Mime::YAML, Mime::ALL]
     assert_equal expect, Mime::Type.parse(accept)
   end
+  
+  def test_custom_type
+    Mime::Type.register("image/gif", :gif)
+    assert_nothing_raised do 
+      Mime::GIF
+      assert_equal Mime::GIF, Mime::SET.last
+    end
+    Mime.send :remove_const, :GIF
+  end
 end