actionpack 1.12.5 → 1.13.0

data/test/abstract_unit.rb

@@ -6,9 +6,11 @@ require 'yaml'
 require 'test/unit'
 require 'action_controller'
 require 'breakpoint'
-
 require 'action_controller/test_process'
 
+# Show backtraces for deprecated behavior for quicker cleanup.
+ActiveSupport::Deprecation.debug = true
+
 ActionController::Base.logger = nil
 ActionController::Base.ignore_missing_templates = false
-ActionController::Routing::Routes.reload rescue nil
+ActionController::Routing::Routes.reload rescue nil

data/test/active_record_unit.rb

@@ -4,85 +4,113 @@ require  File.dirname(__FILE__) + '/abstract_unit'
 class ActiveRecordTestConnector
   cattr_accessor :able_to_connect
   cattr_accessor :connected
-  
+
   # Set our defaults
   self.connected = false
   self.able_to_connect = true
 end
 
 # Try to grab AR
-begin
-  PATH_TO_AR = File.dirname(__FILE__) + '/../../activerecord'
-  require "#{PATH_TO_AR}/lib/active_record" unless Object.const_defined?(:ActiveRecord)
-  require "#{PATH_TO_AR}/lib/active_record/fixtures" unless Object.const_defined?(:Fixtures)
-rescue Object => e
-  $stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
-  ActiveRecordTestConnector.able_to_connect = false
+if defined?(ActiveRecord) && defined?(Fixtures)
+  $stderr.puts 'Active Record is already loaded, running tests'
+else
+  $stderr.print 'Attempting to load Active Record... '
+  begin
+    PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
+    raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
+    $LOAD_PATH.unshift PATH_TO_AR
+    require 'active_record'
+    require 'active_record/fixtures'
+    $stderr.puts 'success'
+  rescue LoadError => e
+    $stderr.print "failed. Skipping Active Record assertion tests: #{e}"
+    ActiveRecordTestConnector.able_to_connect = false
+  end
 end
+$stderr.flush
+
+
 
 # Define the rest of the connector
-class ActiveRecordTestConnector  
-  def self.setup
-    unless self.connected || !self.able_to_connect
-      setup_connection
-      load_schema
-      self.connected = true
+class ActiveRecordTestConnector
+  class << self
+    def setup
+      unless self.connected || !self.able_to_connect
+        setup_connection
+        load_schema
+        require_fixture_models
+        self.connected = true
+      end
+    rescue Exception => e  # errors from ActiveRecord setup
+      $stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
+      #$stderr.puts "  #{e.backtrace.join("\n  ")}\n"
+      self.able_to_connect = false
     end
-  rescue Object => e
-    $stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
-    #$stderr.puts "  #{e.backtrace.join("\n  ")}\n"
-    self.able_to_connect = false
-  end
-  
-  private
-  
-  def self.setup_connection
-    if Object.const_defined?(:ActiveRecord)
-          
-      begin
-        ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
-        ActiveRecord::Base.connection
-      rescue Object
-        $stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.'
-        ActiveRecord::Base.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:')
-        ActiveRecord::Base.connection
+
+    private
+
+    def setup_connection
+      if Object.const_defined?(:ActiveRecord)
+        begin
+          connection_options = {:adapter => 'sqlite3', :dbfile => ':memory:'}
+          ActiveRecord::Base.establish_connection(connection_options)
+          ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => connection_options } 
+          ActiveRecord::Base.connection
+        rescue Exception  # errors from establishing a connection
+          $stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.'
+          connection_options = {:adapter => 'sqlite', :dbfile => ':memory:'}
+          ActiveRecord::Base.establish_connection(connection_options)
+          ActiveRecord::Base.configurations = { 'sqlite2_ar_integration' => connection_options } 
+          ActiveRecord::Base.connection
+        end
+
+        Object.send(:const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')) unless Object.const_defined?(:QUOTED_TYPE)
+      else
+        raise "Couldn't locate ActiveRecord."
       end
-    
-      Object.send(:const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')) unless Object.const_defined?(:QUOTED_TYPE)
-    else
-      raise "Couldn't locate ActiveRecord."
     end
-  end
-  
-  # Load actionpack sqlite tables
-  def self.load_schema
-    File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
-      ActiveRecord::Base.connection.execute(sql) unless sql.blank?
+
+    # Load actionpack sqlite tables
+    def load_schema
+      File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
+        ActiveRecord::Base.connection.execute(sql) unless sql.blank?
+      end
+    end
+
+    def require_fixture_models
+      Dir.glob(File.dirname(__FILE__) + "/fixtures/*.rb").each {|f| require f}
     end
   end
 end
-  
-# Test case for inheiritance  
+
+# Test case for inheiritance
 class ActiveRecordTestCase < Test::Unit::TestCase
   # Set our fixture path
-  self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
-  
+  if ActiveRecordTestConnector.able_to_connect
+    self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
+    self.use_transactional_fixtures = false
+  end
+
+  def self.fixtures(*args)
+    super if ActiveRecordTestConnector.connected
+  end
+
   def setup
-    abort_tests unless ActiveRecordTestConnector.connected = true
+    abort_tests unless ActiveRecordTestConnector.connected
   end
-  
+
   # Default so Test::Unit::TestCase doesn't complain
   def test_truth
   end
-  
+
   private
-  
-  # If things go wrong, we don't want to run our test cases. We'll just define them to test nothing.
-  def abort_tests
-    self.class.public_instance_methods.grep(/^test./).each do |method|
-      self.class.class_eval { define_method(method.to_sym){} }
+    # If things go wrong, we don't want to run our test cases. We'll just define them to test nothing.
+    def abort_tests
+      $stderr.puts 'No Active Record connection, aborting tests.'
+      self.class.public_instance_methods.grep(/^test./).each do |method|
+        self.class.class_eval { define_method(method.to_sym){} }
+      end
     end
-  end
 end
 
-ActiveRecordTestConnector.setup
+ActiveRecordTestConnector.setup

data/test/activerecord/active_record_assertions_test.rb

@@ -1,5 +1,4 @@
 require "#{File.dirname(__FILE__)}/../active_record_unit"
-require 'fixtures/company'
 
 class ActiveRecordAssertionsController < ActionController::Base
   self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
@@ -37,10 +36,10 @@ class ActiveRecordAssertionsController < ActionController::Base
   # the safety dance......
   def rescue_action(e) raise; end
 end
-                  
+
 class ActiveRecordAssertionsControllerTest < ActiveRecordTestCase
   fixtures :companies
-  
+
   def setup
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
@@ -51,34 +50,43 @@ class ActiveRecordAssertionsControllerTest < ActiveRecordTestCase
   # test for 1 bad apple column
   def test_some_invalid_columns
     process :nasty_columns_1
-    assert_success
-    assert_invalid_record 'company'
-    assert_invalid_column_on_record 'company', 'rating'
-    assert_valid_column_on_record 'company', 'name'
-    assert_valid_column_on_record 'company', %w(name id)
+    assert_response :success
+
+    assert_deprecated_assertion { assert_invalid_record 'company' }
+    assert_deprecated_assertion { assert_invalid_column_on_record 'company', 'rating' }
+    assert_deprecated_assertion { assert_valid_column_on_record 'company', 'name' }
+    assert_deprecated_assertion { assert_valid_column_on_record 'company', %w(name id) }
   end
 
   # test for 2 bad apples columns
   def test_all_invalid_columns
     process :nasty_columns_2
-    assert_success
-    assert_invalid_record 'company'
-    assert_invalid_column_on_record 'company', 'rating'
-    assert_invalid_column_on_record 'company', 'name'
-    assert_invalid_column_on_record 'company', %w(name rating)
+    assert_response :success
+
+    assert_deprecated_assertion { assert_invalid_record 'company' }
+    assert_deprecated_assertion { assert_invalid_column_on_record 'company', 'rating' }
+    assert_deprecated_assertion { assert_invalid_column_on_record 'company', 'name' }
+    assert_deprecated_assertion { assert_invalid_column_on_record 'company', %w(name rating) }
   end
 
   # ensure we have no problems with an ActiveRecord
   def test_valid_record
     process :good_company
-    assert_success
-    assert_valid_record 'company'
+    assert_response :success
+
+    assert_deprecated_assertion { assert_valid_record 'company' }
   end
 
   # ensure we have problems with an ActiveRecord
   def test_invalid_record
     process :bad_company
-    assert_success
-    assert_invalid_record 'company'
+    assert_response :success
+
+    assert_deprecated_assertion { assert_invalid_record 'company' }
   end
-end
+
+  protected
+    def assert_deprecated_assertion(message = nil, &block)
+      assert_deprecated(/assert_.*from test_/, &block)
+    end
+end

data/test/activerecord/active_record_store_test.rb

@@ -1,33 +1,8 @@
-# Unfurl the safety net.
-path_to_ar = File.dirname(__FILE__) + '/../../../activerecord'
-if Object.const_defined?(:ActiveRecord) or File.exist?(path_to_ar)
-  begin
-
 # These tests exercise CGI::Session::ActiveRecordStore, so you're going to
 # need AR in a sibling directory to AP and have SQLite installed.
-
-unless Object.const_defined?(:ActiveRecord)
-  require File.join(path_to_ar, 'lib', 'active_record')
-end
-
-require File.dirname(__FILE__) + '/../abstract_unit'
+require File.dirname(__FILE__) + '/../active_record_unit'
 require 'action_controller/session/active_record_store'
 
-#ActiveRecord::Base.logger = Logger.new($stdout)
-begin
-  CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-  CGI::Session::ActiveRecordStore::Session.connection
-rescue Object
-  $stderr.puts 'SQLite 3 unavailable; falling back to SQLite 2.'
-  begin
-    CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite', :database => ':memory:')
-    CGI::Session::ActiveRecordStore::Session.connection
-  rescue Object
-    $stderr.puts 'SQLite 2 unavailable; skipping ActiveRecordStore test suite.'
-    raise SystemExit
-  end
-end
-
 
 module CommonActiveRecordStoreTests
   def test_basics
@@ -55,7 +30,7 @@ module CommonActiveRecordStoreTests
   end
 end
 
-class ActiveRecordStoreTest < Test::Unit::TestCase
+class ActiveRecordStoreTest < ActiveRecordTestCase
   include CommonActiveRecordStoreTests
 
   def session_class
@@ -70,6 +45,7 @@ class ActiveRecordStoreTest < Test::Unit::TestCase
     session_class.create_table!
 
     ENV['REQUEST_METHOD'] = 'GET'
+    ENV['REQUEST_URI'] = '/'
     CGI::Session::ActiveRecordStore.session_class = session_class
 
     @cgi = CGI.new
@@ -107,7 +83,7 @@ class ActiveRecordStoreTest < Test::Unit::TestCase
   end
 end
 
-class ColumnLimitTest < Test::Unit::TestCase
+class ColumnLimitTest < ActiveRecordTestCase
   def setup
     @session_class = CGI::Session::ActiveRecordStore::Session
     @session_class.create_table!
@@ -164,11 +140,3 @@ class SqlBypassActiveRecordStoreTest < ActiveRecordStoreTest
     assert_equal({ 'foo' => 'bar' }, @new_session.model.data)
   end
 end
-
-
-# End of safety net.
-  rescue Object => e
-    $stderr.puts "Skipping CGI::Session::ActiveRecordStore tests: #{e}"
-    #$stderr.puts "  #{e.backtrace.join("\n  ")}"
-  end
-end

data/test/activerecord/pagination_test.rb

@@ -1,13 +1,8 @@
 require File.dirname(__FILE__) + '/../active_record_unit'
 
-require 'fixtures/topic'
-require 'fixtures/reply'
-require 'fixtures/developer'
-require 'fixtures/project'
-
 class PaginationTest < ActiveRecordTestCase
   fixtures :topics, :replies, :developers, :projects, :developers_projects
-
+  
   class PaginationController < ActionController::Base
     self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
     

data/test/controller/action_pack_assertions_test.rb

@@ -4,14 +4,14 @@ require File.dirname(__FILE__) + '/../abstract_unit'
 class ActionPackAssertionsController < ActionController::Base
 
   # this does absolutely nothing
-  def nothing() render_text ""; end
+  def nothing() head :ok end
 
   # a standard template
   def hello_world() render "test/hello_world"; end
 
   # a standard template
   def hello_xml_world() render "test/hello_xml_world"; end
- 
+
   # a redirect to an internal location
   def redirect_internal() redirect_to "/nothing"; end
 
@@ -22,18 +22,18 @@ class ActionPackAssertionsController < ActionController::Base
   def redirect_to_path() redirect_to '/some/path' end
 
   def redirect_to_named_route() redirect_to route_one_url end
-  
+
   # a redirect to an external location
   def redirect_external() redirect_to_url "http://www.rubyonrails.org"; end
-  
+
   # a 404
-  def response404() render_text "", "404 AWOL"; end
+  def response404() head '404 AWOL' end
 
   # a 500
-  def response500() render_text "", "500 Sorry"; end
+  def response500() head '500 Sorry' end
 
   # a fictional 599
-  def response599() render_text "", "599 Whoah!"; end
+  def response599() head '599 Whoah!' end
 
   # putting stuff in the flash
   def flash_me
@@ -54,64 +54,68 @@ class ActionPackAssertionsController < ActionController::Base
   end
 
   def render_based_on_parameters
-    render_text "Mr. #{@params["name"]}"
+    render_text "Mr. #{params[:name]}"
   end
 
   def render_url
     render_text "<div>#{url_for(:action => 'flash_me', :only_path => true)}</div>"
   end
 
+  def render_text_with_custom_content_type
+    render :text => "Hello!", :content_type => Mime::RSS
+  end
+
   # puts something in the session
   def session_stuffing
     session['xmas'] = 'turkey'
     render_text "ho ho ho"
   end
-  
+
   # raises exception on get requests
   def raise_on_get
-    raise "get" if @request.get?
-    render_text "request method: #{@request.env['REQUEST_METHOD']}"
+    raise "get" if request.get?
+    render_text "request method: #{request.env['REQUEST_METHOD']}"
   end
 
   # raises exception on post requests
   def raise_on_post
-    raise "post" if @request.post?
-    render_text "request method: #{@request.env['REQUEST_METHOD']}"
-  end       
-  
+    raise "post" if request.post?
+    render_text "request method: #{request.env['REQUEST_METHOD']}"
+  end
+
   def get_valid_record
-    @record = Class.new do       
+    @record = Class.new do
       def valid?
         true
       end
 
       def errors
-        Class.new do 
-           def full_messages; []; end          
+        Class.new do
+           def full_messages; []; end
         end.new
-      end    
-    
+      end
+
     end.new
-        
-    render :nothing => true    
+
+    render :nothing => true
   end
 
 
   def get_invalid_record
-    @record = Class.new do 
-      
+    @record = Class.new do
+
       def valid?
         false
       end
-      
+
       def errors
-        Class.new do 
-           def full_messages; ['...stuff...']; end          
+        Class.new do
+           def full_messages; ['...stuff...']; end
         end.new
       end
-    end.new                
-    
-    render :nothing => true    
+    end.new
+
+    render :nothing => true
   end
 
   # 911
@@ -120,32 +124,51 @@ end
 
 module Admin
   class InnerModuleController < ActionController::Base
+    def index
+      render :nothing => true
+    end
+
+    def redirect_to_index
+      redirect_to admin_inner_module_path
+    end
+
     def redirect_to_absolute_controller
       redirect_to :controller => '/content'
     end
+
     def redirect_to_fellow_controller
       redirect_to :controller => 'user'
     end
+
+    def redirect_to_top_level_named_route
+      redirect_to top_level_url(:id => "foo")
+    end
   end
 end
 
 # ---------------------------------------------------------------------------
 
 
-# tell the controller where to find its templates but start from parent 
-# directory of test_request_response to simulate the behaviour of a 
+# tell the controller where to find its templates but start from parent
+# directory of test_request_response to simulate the behaviour of a
 # production environment
 ActionPackAssertionsController.template_root = File.dirname(__FILE__) + "/../fixtures/"
 
 
 # a test case to exercise the new capabilities TestRequest & TestResponse
 class ActionPackAssertionsControllerTest < Test::Unit::TestCase
-  # let's get this party started  
+  # let's get this party started
   def setup
+    ActionController::Routing::Routes.reload
+    ActionController::Routing.use_controllers!(%w(action_pack_assertions admin/inner_module content admin/user))
     @controller = ActionPackAssertionsController.new
     @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
   end
- 
+
+  def teardown
+    ActionController::Routing::Routes.reload
+  end
+
   # -- assertion-based testing ------------------------------------------------
 
   def test_assert_tag_and_url_for
@@ -156,10 +179,10 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # test the session assertion to make sure something is there.
   def test_assert_session_has
     process :session_stuffing
-    assert_session_has 'xmas'
-    assert_session_has_no 'halloween'
+    assert_deprecated_assertion { assert_session_has 'xmas' }
+    assert_deprecated_assertion { assert_session_has_no 'halloween' }
   end
-  
+
   # test the get method, make sure the request really was a get
   def test_get
     assert_raise(RuntimeError) { get :raise_on_get }
@@ -173,7 +196,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     post :raise_on_get
     assert_equal @response.body, 'request method: POST'
   end
-  
+
 #   the following test fails because the request_method is now cached on the request instance
 #   test the get/post switch within one test action
 #   def test_get_post_switch
@@ -190,106 +213,168 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
   # test the assertion of goodies in the template
   def test_assert_template_has
     process :assign_this
-    assert_template_has 'howdy'
+    assert_deprecated_assertion { assert_template_has 'howdy' }
   end
 
   # test the assertion for goodies that shouldn't exist in the template
   def test_assert_template_has_no
     process :nothing
-    assert_template_has_no 'maple syrup'
-    assert_template_has_no 'howdy'
+    assert_deprecated_assertion { assert_template_has_no 'maple syrup' }
+    assert_deprecated_assertion { assert_template_has_no 'howdy' }
   end
-  
+
   # test the redirection assertions
   def test_assert_redirect
     process :redirect_internal
-    assert_redirect
+    assert_deprecated_assertion { assert_redirect }
   end
 
   # test the redirect url string
   def test_assert_redirect_url
     process :redirect_external
-    assert_redirect_url 'http://www.rubyonrails.org'
+    assert_deprecated_assertion do
+      assert_redirect_url 'http://www.rubyonrails.org'
+    end
   end
 
   # test the redirection pattern matching on a string
   def test_assert_redirect_url_match_string
     process :redirect_external
-    assert_redirect_url_match 'rails.org'
+    assert_deprecated_assertion do
+      assert_redirect_url_match 'rails.org'
+    end
   end
-  
+
   # test the redirection pattern matching on a pattern
   def test_assert_redirect_url_match_pattern
     process :redirect_external
-    assert_redirect_url_match /ruby/
+    assert_deprecated_assertion do
+      assert_redirect_url_match /ruby/
+    end
   end
 
   # test the redirection to a named route
   def test_assert_redirect_to_named_route
-    process :redirect_to_named_route
-    assert_raise(Test::Unit::AssertionFailedError) do
-      assert_redirected_to 'http://test.host/route_two'
+    with_routing do |set|
+      set.draw do |map|
+        map.route_one 'route_one', :controller => 'action_pack_assertions', :action => 'nothing'
+        map.connect   ':controller/:action/:id'
+      end
+      set.named_routes.install
+
+      process :redirect_to_named_route
+      assert_redirected_to 'http://test.host/route_one'
+      assert_redirected_to route_one_url
+      assert_redirected_to :route_one_url
+    end
+  end
+
+  def test_assert_redirect_to_named_route_failure
+    with_routing do |set|
+      set.draw do |map|
+        map.route_one 'route_one', :controller => 'action_pack_assertions', :action => 'nothing', :id => 'one'
+        map.route_two 'route_two', :controller => 'action_pack_assertions', :action => 'nothing', :id => 'two'
+        map.connect   ':controller/:action/:id'
+      end
+      process :redirect_to_named_route
+      assert_raise(Test::Unit::AssertionFailedError) do
+        assert_redirected_to 'http://test.host/route_two'
+      end
+      assert_raise(Test::Unit::AssertionFailedError) do
+        assert_redirected_to :controller => 'action_pack_assertions', :action => 'nothing', :id => 'two'
+      end
+      assert_raise(Test::Unit::AssertionFailedError) do
+        assert_redirected_to route_two_url
+      end
+      assert_raise(Test::Unit::AssertionFailedError) do
+        assert_redirected_to :route_two_url
+      end
     end
   end
-  
+
+  def test_assert_redirect_to_nested_named_route
+    with_routing do |set|
+      set.draw do |map|
+        map.admin_inner_module 'admin/inner_module', :controller => 'admin/inner_module', :action => 'index'
+        map.connect            ':controller/:action/:id'
+      end
+      @controller = Admin::InnerModuleController.new
+      process :redirect_to_index
+      # redirection is <{"action"=>"index", "controller"=>"admin/admin/inner_module"}>
+      assert_redirected_to admin_inner_module_path
+    end
+  end
+
+  def test_assert_redirected_to_top_level_named_route_from_nested_controller
+    with_routing do |set|
+      set.draw do |map|
+        map.top_level '/action_pack_assertions/:id', :controller => 'action_pack_assertions', :action => 'index'
+        map.connect   ':controller/:action/:id'
+      end
+      @controller = Admin::InnerModuleController.new
+      process :redirect_to_top_level_named_route
+      # passes -> assert_redirected_to "http://test.host/action_pack_assertions/foo"
+      assert_redirected_to "/action_pack_assertions/foo"
+    end
+  end
+
   # test the flash-based assertions with something is in the flash
   def test_flash_assertions_full
     process :flash_me
     assert @response.has_flash_with_contents?
-    assert_flash_exists
-    assert_flash_not_empty
-    assert_flash_has 'hello'
-    assert_flash_has_no 'stds'
+    assert_deprecated_assertion { assert_flash_exists }
+    assert_deprecated_assertion { assert_flash_not_empty }
+    assert_deprecated_assertion { assert_flash_has 'hello' }
+    assert_deprecated_assertion { assert_flash_has_no 'stds' }
   end
 
   # test the flash-based assertions with no flash at all
   def test_flash_assertions_negative
     process :nothing
-    assert_flash_empty
-    assert_flash_has_no 'hello'
-    assert_flash_has_no 'qwerty'
+    assert_deprecated_assertion { assert_flash_empty }
+    assert_deprecated_assertion { assert_flash_has_no 'hello' }
+    assert_deprecated_assertion { assert_flash_has_no 'qwerty' }
   end
-  
-  # test the assert_rendered_file 
+
+  # test the assert_rendered_file
   def test_assert_rendered_file
-    process :hello_world
-    assert_rendered_file 'test/hello_world'
-    assert_rendered_file 'hello_world'
+    assert_deprecated(/render/) { process :hello_world }
+    assert_deprecated_assertion { assert_rendered_file 'test/hello_world' }
+    assert_deprecated_assertion { assert_rendered_file 'hello_world' }
   end
-  
+
   # test the assert_success assertion
   def test_assert_success
     process :nothing
-    assert_success
-    assert_rendered_file
+    assert_deprecated_assertion { assert_success }
   end
-  
+
   # -- standard request/response object testing --------------------------------
- 
+
   # ensure our session is working properly
   def test_session_objects
     process :session_stuffing
     assert @response.has_session_object?('xmas')
-    assert_session_equal 'turkey', 'xmas'
+    assert_deprecated_assertion { assert_session_equal 'turkey', 'xmas' }
     assert !@response.has_session_object?('easter')
   end
-  
+
   # make sure that the template objects exist
   def test_template_objects_alive
     process :assign_this
     assert !@response.has_template_object?('hi')
     assert @response.has_template_object?('howdy')
   end
-  
+
   # make sure we don't have template objects when we shouldn't
   def test_template_object_missing
     process :nothing
     assert_nil @response.template_objects['howdy']
   end
-  
+
   def test_assigned_equal
     process :assign_this
-    assert_assigned_equal "ho", :howdy
+    assert_deprecated_assertion { assert_assigned_equal "ho", :howdy }
   end
 
   # check the empty flashing
@@ -314,24 +399,25 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert !@response.has_flash_with_contents?
     assert_nil @response.flash['hello']
   end
-  
+
   # examine that the flash objects are what we expect
   def test_flash_equals
     process :flash_me
-    assert_flash_equal 'my name is inigo montoya...', 'hello'
+    assert_deprecated_assertion do
+      assert_flash_equal 'my name is inigo montoya...', 'hello'
+    end
   end
-  
-  
-  # check if we were rendered by a file-based template? 
+
+  # check if we were rendered by a file-based template?
   def test_rendered_action
     process :nothing
     assert !@response.rendered_with_file?
 
-    process :hello_world
+    assert_deprecated(/render/) { process :hello_world }
     assert @response.rendered_with_file?
     assert 'hello_world', @response.rendered_file
   end
-  
+
   # check the redirection location
   def test_redirection_location
     process :redirect_internal
@@ -339,24 +425,26 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
 
     process :redirect_external
     assert_equal 'http://www.rubyonrails.org', @response.redirect_url
+  end
 
+  def test_no_redirect_url
     process :nothing
     assert_nil @response.redirect_url
   end
-  
- 
-  # check server errors 
+
+
+  # check server errors
   def test_server_error_response_code
     process :response500
     assert @response.server_error?
-    
+
     process :response599
     assert @response.server_error?
-    
+
     process :response404
     assert !@response.server_error?
   end
-  
+
   # check a 404 response code
   def test_missing_response_code
     process :response404
@@ -372,7 +460,7 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert !@response.redirect_url_match?("phpoffrails")
     assert !@response.redirect_url_match?(/perloffrails/)
   end
-  
+
   # check for a redirection
   def test_redirection
     process :redirect_internal
@@ -384,51 +472,57 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     process :nothing
     assert !@response.redirect?
   end
-  
+
   # check a successful response code
   def test_successful_response_code
     process :nothing
     assert @response.success?
-  end 
-  
+  end
+
   # a basic check to make sure we have a TestResponse object
   def test_has_response
     process :nothing
     assert_kind_of ActionController::TestResponse, @response
   end
-  
+
   def test_render_based_on_parameters
     process :render_based_on_parameters, "name" => "David"
     assert_equal "Mr. David", @response.body
   end
 
   def test_assert_template_xpath_match_no_matches
-    process :hello_xml_world
+    assert_deprecated(/render/) { process :hello_xml_world }
     assert_raises Test::Unit::AssertionFailedError do
-      assert_template_xpath_match('/no/such/node/in/document')
+      assert_deprecated_assertion do
+        assert_template_xpath_match('/no/such/node/in/document')
+      end
     end
   end
 
   def test_simple_one_element_xpath_match
-    process :hello_xml_world
-    assert_template_xpath_match('//title', "Hello World")
+    assert_deprecated(/render/) { process :hello_xml_world }
+    assert_deprecated_assertion do
+      assert_template_xpath_match('//title', "Hello World")
+    end
   end
 
   def test_array_of_elements_in_xpath_match
-    process :hello_xml_world
-    assert_template_xpath_match('//p', %w( abes monks wiseguys ))
+    assert_deprecated(/render/) { process :hello_xml_world }
+    assert_deprecated_assertion do
+      assert_template_xpath_match('//p', %w( abes monks wiseguys ))
+    end
   end
 
   def test_follow_redirect
     process :redirect_to_action
     assert_redirected_to :action => "flash_me"
-    
+
     follow_redirect
     assert_equal 1, @request.parameters["id"].to_i
 
     assert "Inconceivable!", @response.body
   end
-  
+
   def test_follow_redirect_outside_current_action
     process :redirect_to_controller
     assert_redirected_to :controller => "elsewhere", :action => "flash_me"
@@ -436,6 +530,18 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     assert_raises(RuntimeError, "Can't follow redirects outside of current controller (elsewhere)") { follow_redirect }
   end
 
+  def test_assert_redirection_fails_with_incorrect_controller
+    process :redirect_to_controller
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_redirected_to :controller => "action_pack_assertions", :action => "flash_me"
+    end
+  end
+
+  def test_assert_redirection_with_extra_controller_option
+    get :redirect_to_action
+    assert_redirected_to :controller => 'action_pack_assertions', :action => "flash_me", :id => 1, :params => { :panda => 'fun' }
+  end
+
   def test_redirected_to_url_leadling_slash
     process :redirect_to_path
     assert_redirected_to '/some/path'
@@ -453,41 +559,52 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
     @controller = Admin::InnerModuleController.new
     get :redirect_to_absolute_controller
     assert_redirected_to :controller => 'content'
-    
+
     get :redirect_to_fellow_controller
     assert_redirected_to :controller => 'admin/user'
-  end                 
-  
+  end
+
   def test_assert_valid
     get :get_valid_record
-    assert_valid assigns('record')    
-  end                
-  
+    assert_valid assigns('record')
+  end
+
   def test_assert_valid_failing
     get :get_invalid_record
-    
+
     begin
-      assert_valid assigns('record')    
+      assert_valid assigns('record')
       assert false
-    rescue Test::Unit::AssertionFailedError => e             
+    rescue Test::Unit::AssertionFailedError => e
     end
   end
+
+  protected
+    def assert_deprecated_assertion(&block)
+      assert_deprecated(/assert/, &block)
+    end
 end
 
-class ActionPackHeaderTest < Test::Unit::TestCase  
+class ActionPackHeaderTest < Test::Unit::TestCase
   def setup
     @controller = ActionPackAssertionsController.new
     @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
   end
 
   def test_rendering_xml_sets_content_type
-    process :hello_xml_world
-    assert_equal('application/xml', @controller.headers['Content-Type'])
+    assert_deprecated(/render/) { process :hello_xml_world }
+    assert_equal('application/xml; charset=utf-8', @controller.headers['Content-Type'])
   end
 
   def test_rendering_xml_respects_content_type
     @response.headers['Content-Type'] = 'application/pdf'
-    process :hello_xml_world
-    assert_equal('application/pdf', @controller.headers['Content-Type'])
+    assert_deprecated(/render/) { process :hello_xml_world }
+    assert_equal('application/pdf; charset=utf-8', @controller.headers['Content-Type'])
+  end
+
+
+  def test_render_text_with_custom_content_type
+    get :render_text_with_custom_content_type
+    assert_equal 'application/rss+xml; charset=utf-8', @response.headers['Content-Type']
   end
 end