actionpack-2.3.17-rack-upgrade 2.3.17

data/test/controller/record_identifier_test.rb

@@ -0,0 +1,139 @@
+require 'abstract_unit'
+
+class Comment
+  attr_reader :id
+  def save; @id = 1 end
+  def new_record?; @id.nil? end
+  def name
+    @id.nil? ? 'new comment' : "comment ##{@id}"
+  end
+end
+
+class Comment::Nested < Comment; end
+
+class Test::Unit::TestCase
+  protected
+    def comments_url
+      'http://www.example.com/comments'
+    end
+    
+    def comment_url(comment)
+      "http://www.example.com/comments/#{comment.id}"
+    end
+end
+
+
+class RecordIdentifierTest < Test::Unit::TestCase
+  include ActionController::RecordIdentifier
+
+  def setup
+    @klass  = Comment
+    @record = @klass.new
+    @singular = 'comment'
+    @plural = 'comments'
+  end
+
+  def test_dom_id_with_new_record
+    assert_equal "new_#{@singular}", dom_id(@record)
+  end
+
+  def test_dom_id_with_new_record_and_prefix
+    assert_equal "custom_prefix_#{@singular}", dom_id(@record, :custom_prefix)
+  end
+
+  def test_dom_id_with_saved_record
+    @record.save
+    assert_equal "#{@singular}_1", dom_id(@record)
+  end
+
+  def test_dom_id_with_prefix
+    @record.save
+    assert_equal "edit_#{@singular}_1", dom_id(@record, :edit)
+  end
+
+  def test_partial_path
+    expected = "#{@plural}/#{@singular}"
+    assert_equal expected, partial_path(@record)
+    assert_equal expected, partial_path(Comment)
+  end
+
+  def test_partial_path_with_namespaced_controller_path
+    expected = "admin/#{@plural}/#{@singular}"
+    assert_equal expected, partial_path(@record, "admin/posts")
+    assert_equal expected, partial_path(@klass, "admin/posts")
+  end
+
+  def test_partial_path_with_not_namespaced_controller_path
+    expected = "#{@plural}/#{@singular}"
+    assert_equal expected, partial_path(@record, "posts")
+    assert_equal expected, partial_path(@klass, "posts")
+  end
+
+  def test_dom_class
+    assert_equal @singular, dom_class(@record)
+  end
+  
+  def test_dom_class_with_prefix
+    assert_equal "custom_prefix_#{@singular}", dom_class(@record, :custom_prefix)
+  end
+
+  def test_singular_class_name
+    assert_equal @singular, singular_class_name(@record)
+  end
+
+  def test_singular_class_name_for_class
+    assert_equal @singular, singular_class_name(@klass)
+  end
+
+  def test_plural_class_name
+    assert_equal @plural, plural_class_name(@record)
+  end
+
+  def test_plural_class_name_for_class
+    assert_equal @plural, plural_class_name(@klass)
+  end
+
+  private
+    def method_missing(method, *args)
+      RecordIdentifier.send(method, *args)
+    end
+end
+
+class NestedRecordIdentifierTest < RecordIdentifierTest
+  def setup
+    @klass  = Comment::Nested
+    @record = @klass.new
+    @singular = 'comment_nested'
+    @plural = 'comment_nesteds'
+  end
+
+  def test_partial_path
+    expected = "comment/nesteds/nested"
+    assert_equal expected, partial_path(@record)
+    assert_equal expected, partial_path(Comment::Nested)
+  end
+
+  def test_partial_path_with_namespaced_controller_path
+    expected = "admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "admin/posts")
+    assert_equal expected, partial_path(@klass, "admin/posts")
+  end
+
+  def test_partial_path_with_deeper_namespaced_controller_path
+    expected = "deeper/admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "deeper/admin/posts")
+    assert_equal expected, partial_path(@klass, "deeper/admin/posts")
+  end
+
+  def test_partial_path_with_even_deeper_namespaced_controller_path
+    expected = "even/more/deeper/admin/comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "even/more/deeper/admin/posts")
+    assert_equal expected, partial_path(@klass, "even/more/deeper/admin/posts")
+  end
+
+  def test_partial_path_with_not_namespaced_controller_path
+    expected = "comment/nesteds/nested"
+    assert_equal expected, partial_path(@record, "posts")
+    assert_equal expected, partial_path(@klass, "posts")
+  end
+end

data/test/controller/redirect_test.rb

@@ -0,0 +1,285 @@
+require 'abstract_unit'
+
+class WorkshopsController < ActionController::Base
+end
+
+class Workshop
+  attr_accessor :id, :new_record
+
+  def initialize(id, new_record)
+    @id, @new_record = id, new_record
+  end
+
+  def new_record?
+    @new_record
+  end
+
+  def to_s
+    id.to_s
+  end
+end
+
+class RedirectController < ActionController::Base
+  def simple_redirect
+    redirect_to :action => "hello_world"
+  end
+
+  def redirect_with_status
+    redirect_to({:action => "hello_world", :status => 301})
+  end
+
+  def redirect_with_status_hash
+    redirect_to({:action => "hello_world"}, {:status => 301})
+  end
+
+  def url_redirect_with_status
+    redirect_to("http://www.example.com", :status => :moved_permanently)
+  end
+
+  def url_redirect_with_status_hash
+    redirect_to("http://www.example.com", {:status => 301})
+  end
+
+  def relative_url_redirect_with_status
+    redirect_to("/things/stuff", :status => :found)
+  end
+
+  def relative_url_redirect_with_status_hash
+    redirect_to("/things/stuff", {:status => 301})
+  end
+
+  def redirect_to_back_with_status
+    redirect_to :back, :status => 307
+  end
+
+  def host_redirect
+    redirect_to :action => "other_host", :only_path => false, :host => 'other.test.host'
+  end
+
+  def module_redirect
+    redirect_to :controller => 'module_test/module_redirect', :action => "hello_world"
+  end
+
+  def redirect_with_assigns
+    @hello = "world"
+    redirect_to :action => "hello_world"
+  end
+
+  def redirect_to_url
+    redirect_to "http://www.rubyonrails.org/"
+  end
+
+  def redirect_to_url_with_unescaped_query_string
+    redirect_to "http://dev.rubyonrails.org/query?status=new"
+  end
+
+  def redirect_to_url_with_complex_scheme
+    redirect_to "x-test+scheme.complex:redirect"
+  end
+
+  def redirect_to_back
+    redirect_to :back
+  end
+
+  def redirect_to_existing_record
+    redirect_to Workshop.new(5, false)
+  end
+
+  def redirect_to_new_record
+    redirect_to Workshop.new(5, true)
+  end
+
+  def redirect_to_nil
+    redirect_to nil
+  end
+
+  def rescue_errors(e) raise e end
+
+  def rescue_action(e) raise end
+
+  protected
+    def dashbord_url(id, message)
+      url_for :action => "dashboard", :params => { "id" => id, "message" => message }
+    end
+end
+
+class RedirectTest < ActionController::TestCase
+  tests RedirectController
+
+  def test_simple_redirect
+    get :simple_redirect
+    assert_response :redirect
+    assert_equal "http://test.host/redirect/hello_world", redirect_to_url
+  end
+
+  def test_redirect_with_no_status
+    get :simple_redirect
+    assert_response 302
+    assert_equal "http://test.host/redirect/hello_world", redirect_to_url
+  end
+
+  def test_redirect_with_status
+    get :redirect_with_status
+    assert_response 301
+    assert_equal "http://test.host/redirect/hello_world", redirect_to_url
+  end
+
+  def test_redirect_with_status_hash
+    get :redirect_with_status_hash
+    assert_response 301
+    assert_equal "http://test.host/redirect/hello_world", redirect_to_url
+  end
+
+  def test_url_redirect_with_status
+    get :url_redirect_with_status
+    assert_response 301
+    assert_equal "http://www.example.com", redirect_to_url
+  end
+
+  def test_url_redirect_with_status_hash
+    get :url_redirect_with_status_hash
+    assert_response 301
+    assert_equal "http://www.example.com", redirect_to_url
+  end
+
+
+  def test_relative_url_redirect_with_status
+    get :relative_url_redirect_with_status
+    assert_response 302
+    assert_equal "http://test.host/things/stuff", redirect_to_url
+  end
+
+  def test_relative_url_redirect_with_status_hash
+    get :relative_url_redirect_with_status_hash
+    assert_response 301
+    assert_equal "http://test.host/things/stuff", redirect_to_url
+  end
+
+  def test_redirect_to_back_with_status
+    @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from"
+    get :redirect_to_back_with_status
+    assert_response 307
+    assert_equal "http://www.example.com/coming/from", redirect_to_url
+  end
+
+  def test_simple_redirect_using_options
+    get :host_redirect
+    assert_response :redirect
+    assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
+  end
+
+  def test_module_redirect
+    get :module_redirect
+    assert_response :redirect
+    assert_redirected_to "http://test.host/module_test/module_redirect/hello_world"
+  end
+
+  def test_module_redirect_using_options
+    get :module_redirect
+    assert_response :redirect
+    assert_redirected_to :controller => 'module_test/module_redirect', :action => 'hello_world'
+  end
+
+  def test_redirect_with_assigns
+    get :redirect_with_assigns
+    assert_response :redirect
+    assert_equal "world", assigns["hello"]
+  end
+
+  def test_redirect_to_url
+    get :redirect_to_url
+    assert_response :redirect
+    assert_redirected_to "http://www.rubyonrails.org/"
+  end
+
+  def test_redirect_to_url_with_unescaped_query_string
+    get :redirect_to_url_with_unescaped_query_string
+    assert_response :redirect
+    assert_redirected_to "http://dev.rubyonrails.org/query?status=new"
+  end
+
+  def test_redirect_to_url_with_complex_scheme
+    get :redirect_to_url_with_complex_scheme
+    assert_response :redirect
+    assert_equal "x-test+scheme.complex:redirect", redirect_to_url
+  end
+
+  def test_redirect_to_back
+    @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from"
+    get :redirect_to_back
+    assert_response :redirect
+    assert_equal "http://www.example.com/coming/from", redirect_to_url
+  end
+
+  def test_redirect_to_back_with_no_referer
+    assert_raise(ActionController::RedirectBackError) {
+      @request.env["HTTP_REFERER"] = nil
+      get :redirect_to_back
+    }
+  end
+
+  def test_redirect_to_record
+    ActionController::Routing::Routes.draw do |map|
+      map.resources :workshops
+      map.connect ':controller/:action/:id'
+    end
+
+    get :redirect_to_existing_record
+    assert_equal "http://test.host/workshops/5", redirect_to_url
+    assert_redirected_to Workshop.new(5, false)
+
+    get :redirect_to_new_record
+    assert_equal "http://test.host/workshops", redirect_to_url
+    assert_redirected_to Workshop.new(5, true)
+  end
+
+  def test_redirect_with_partial_params
+    get :module_redirect
+
+    assert_deprecated(/test_redirect_with_partial_params/) do
+      assert_redirected_to :action => 'hello_world'
+    end
+  end
+
+  def test_redirect_to_nil
+    assert_raise(ActionController::ActionControllerError) do
+      get :redirect_to_nil
+    end
+  end
+end
+
+module ModuleTest
+  class ModuleRedirectController < ::RedirectController
+    def module_redirect
+      redirect_to :controller => '/redirect', :action => "hello_world"
+    end
+  end
+
+  class ModuleRedirectTest < ActionController::TestCase
+    tests ModuleRedirectController
+
+    def test_simple_redirect
+      get :simple_redirect
+      assert_response :redirect
+      assert_equal "http://test.host/module_test/module_redirect/hello_world", redirect_to_url
+    end
+
+    def test_simple_redirect_using_options
+      get :host_redirect
+      assert_response :redirect
+      assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
+    end
+
+    def test_module_redirect
+      get :module_redirect
+      assert_response :redirect
+      assert_equal "http://test.host/redirect/hello_world", redirect_to_url
+    end
+
+    def test_module_redirect_using_options
+      get :module_redirect
+      assert_response :redirect
+      assert_redirected_to :controller => '/redirect', :action => "hello_world"
+    end
+  end
+end

data/test/controller/reloader_test.rb

@@ -0,0 +1,125 @@
+require 'abstract_unit'
+require 'thread'
+
+class ReloaderTests < ActiveSupport::TestCase
+  Reloader   = ActionController::Reloader
+  Dispatcher = ActionController::Dispatcher
+
+  class MyBody < Array
+    def initialize(&block)
+      @on_close = block
+    end
+
+    def foo
+      "foo"
+    end
+
+    def bar
+      "bar"
+    end
+
+    def close
+      @on_close.call if @on_close
+    end
+  end
+
+  def setup
+    @lock = Mutex.new
+  end
+
+  def test_it_reloads_the_application_before_yielding
+    Dispatcher.expects(:reload_application)
+    Reloader.run(@lock) do
+      [200, { "Content-Type" => "text/html" }, [""]]
+    end
+  end
+
+  def test_it_locks_before_yielding
+    lock = DummyMutex.new
+    Dispatcher.expects(:reload_application)
+    Reloader.run(lock) do
+      assert lock.locked?
+      [200, { "Content-Type" => "text/html" }, [""]]
+    end
+    assert lock.locked?
+  end
+
+  def test_it_unlocks_upon_calling_close_on_body
+    lock = DummyMutex.new
+    Dispatcher.expects(:reload_application)
+    headers, status, body = Reloader.run(lock) do
+      [200, { "Content-Type" => "text/html" }, [""]]
+    end
+    body.close
+    assert !lock.locked?
+  end
+
+  def test_it_unlocks_if_app_object_raises_exception
+    lock = DummyMutex.new
+    Dispatcher.expects(:reload_application)
+    assert_raise(RuntimeError) do
+      Reloader.run(lock) do
+        raise "oh no!"
+      end
+    end
+    assert !lock.locked?
+  end
+
+  def test_returned_body_object_always_responds_to_close
+    status, headers, body = Reloader.run(@lock) do
+      [200, { "Content-Type" => "text/html" }, [""]]
+    end
+    assert body.respond_to?(:close)
+  end
+
+  def test_returned_body_object_behaves_like_underlying_object
+    status, headers, body = Reloader.run(@lock) do
+      b = MyBody.new
+      b << "hello"
+      b << "world"
+      [200, { "Content-Type" => "text/html" }, b]
+    end
+    assert_equal 2, body.size
+    assert_equal "hello", body[0]
+    assert_equal "world", body[1]
+    assert_equal "foo", body.foo
+    assert_equal "bar", body.bar
+  end
+
+  def test_it_calls_close_on_underlying_object_when_close_is_called_on_body
+    close_called = false
+    status, headers, body = Reloader.run(@lock) do
+      b = MyBody.new do
+        close_called = true
+      end
+      [200, { "Content-Type" => "text/html" }, b]
+    end
+    body.close
+    assert close_called
+  end
+
+  def test_returned_body_object_responds_to_all_methods_supported_by_underlying_object
+    status, headers, body = Reloader.run(@lock) do
+      [200, { "Content-Type" => "text/html" }, MyBody.new]
+    end
+    assert body.respond_to?(:size)
+    assert body.respond_to?(:each)
+    assert body.respond_to?(:foo)
+    assert body.respond_to?(:bar)
+  end
+
+  def test_it_doesnt_clean_up_the_application_after_call
+    Dispatcher.expects(:cleanup_application).never
+    status, headers, body = Reloader.run(@lock) do
+      [200, { "Content-Type" => "text/html" }, MyBody.new]
+    end
+  end
+
+  def test_it_cleans_up_the_application_when_close_is_called_on_body
+    Dispatcher.expects(:cleanup_application)
+    status, headers, body = Reloader.run(@lock) do
+      [200, { "Content-Type" => "text/html" }, MyBody.new]
+    end
+    body.close
+  end
+end