4 files changed, 81 insertions, 2 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index ab3eb4c9e7..b1f7076776 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -432,5 +432,36 @@ module ApplicationTests
       get "/"
       assert_equal 'true', last_response.body
     end
+
+    test "config.action_controller.wrap_parameters is set in ActionController::Base" do
+      app_file 'config/initializers/wrap_parameters.rb', <<-RUBY
+        ActionController::Base.wrap_parameters :format => [:json]
+      RUBY
+      require "#{app_path}/config/environment"
+      require 'action_controller/base'
+
+      assert_equal [:json], ActionController::Base._wrapper_options[:format]
+    end
+
+    test "config.action_dispatch.ignore_accept_header" do
+      make_basic_app do |app|
+        app.config.action_dispatch.ignore_accept_header = true
+      end
+
+      class ::OmgController < ActionController::Base
+        def index
+          respond_to do |format|
+            format.html { render :text => "HTML" }
+            format.xml { render :text => "XML" }
+          end
+        end
+      end
+
+      get "/", {}, "HTTP_ACCEPT" => "application/xml"
+      assert_equal 'HTML', last_response.body
+
+      get "/", { :format => :xml }, "HTTP_ACCEPT" => "application/xml"
+      assert_equal 'XML', last_response.body
+    end
   end
 end
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 793e73556c..5ae6323345 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -8,9 +8,9 @@ class ConsoleTest < Test::Unit::TestCase
     boot_rails
   end
 
-  def load_environment
+  def load_environment(sandbox = false)
     require "#{rails_root}/config/environment"
-    Rails.application.load_console
+    Rails.application.load_console(sandbox)
   end
 
   def test_app_method_should_return_integration_session
@@ -73,6 +73,20 @@ class ConsoleTest < Test::Unit::TestCase
       helper.truncate('Once upon a time in a world far far away')
   end
 
+  def test_with_sandbox
+    require 'rails/all'
+    value = false
+
+    Class.new(Rails::Railtie) do
+      console do |sandbox|
+        value = sandbox
+      end
+    end
+
+    load_environment(true)
+    assert value
+  end
+
   def test_active_record_does_not_panic_when_referencing_an_observed_constant
     add_to_config "config.active_record.observers = :user_observer"
 
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 59e5ef4dee..a8bcf7beaf 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -64,6 +64,15 @@ module ApplicationTests
       assert_match 'cart GET /cart(.:format)', Dir.chdir(app_path){ `rake routes` }
     end
 
+    def test_rake_routes_shows_custom_assets
+      app_file "config/routes.rb", <<-RUBY
+        AppTemplate::Application.routes.draw do
+          get '/custom/assets', :to => 'custom_assets#show'
+        end
+      RUBY
+      assert_match 'custom_assets GET /custom/assets(.:format)', Dir.chdir(app_path){ `rake routes` }
+    end
+
     def test_model_and_migration_generator_with_change_syntax
       Dir.chdir(app_path) do
         `rails generate model user username:string password:string`
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 1fbbb40132..f96319f472 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -65,6 +65,31 @@ module ApplicationTests
       run_test 'integration/posts_test.rb'
     end
 
+    test "performance test" do
+      controller 'posts', <<-RUBY
+        class PostsController < ActionController::Base
+        end
+      RUBY
+
+      app_file 'app/views/posts/index.html.erb', <<-HTML
+        Posts#index
+      HTML
+
+      app_file 'test/performance/posts_test.rb', <<-RUBY
+        require 'test_helper'
+        require 'rails/performance_test_help'
+
+        class PostsTest < ActionDispatch::PerformanceTest
+          def test_index
+            get '/posts'
+            assert_response :success
+          end
+        end
+      RUBY
+
+      run_test 'performance/posts_test.rb'
+    end
+
     private
       def run_test(name)
         result = ruby '-Itest', "#{app_path}/test/#{name}"