3 files changed, 47 insertions, 6 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index b1f7076776..6193e72625 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -12,7 +12,6 @@ end
 
 class ::MyOtherMailObserver < ::MyMailObserver; end
 
-
 module ApplicationTests
   class ConfigurationTest < Test::Unit::TestCase
     include ActiveSupport::Testing::Isolation
@@ -437,10 +436,35 @@ module ApplicationTests
       app_file 'config/initializers/wrap_parameters.rb', <<-RUBY
         ActionController::Base.wrap_parameters :format => [:json]
       RUBY
+
+      app_file 'app/models/post.rb', <<-RUBY
+      class Post
+        def self.column_names
+          %w(title)
+        end
+      end
+      RUBY
+
+      app_file 'app/controllers/posts_controller.rb', <<-RUBY
+      class PostsController < ApplicationController
+        def index
+          render :text => params[:post].inspect
+        end
+      end
+      RUBY
+
+      add_to_config <<-RUBY
+        routes.append do
+          resources :posts
+        end
+      RUBY
+
       require "#{app_path}/config/environment"
-      require 'action_controller/base'
+      require "rack/test"
+      extend Rack::Test::Methods
 
-      assert_equal [:json], ActionController::Base._wrapper_options[:format]
+      post "/posts.json", '{ "title": "foo", "name": "bar" }', "CONTENT_TYPE" => "application/json"
+      assert_equal '{"title"=>"foo"}', last_response.body
     end
 
     test "config.action_dispatch.ignore_accept_header" do
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index a8bcf7beaf..d77c2d14ab 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -73,6 +73,19 @@ module ApplicationTests
       assert_match 'custom_assets GET /custom/assets(.:format)', Dir.chdir(app_path){ `rake routes` }
     end
 
+    def test_logger_is_flushed_when_exiting_production_rake_tasks
+      add_to_config <<-RUBY
+        rake_tasks do
+          task :log_something => :environment do
+            Rails.logger.error("Sample log message")
+          end
+        end
+      RUBY
+
+      output = Dir.chdir(app_path){ `rake log_something RAILS_ENV=production && cat log/production.log` }
+      assert_match "Sample log message", output
+    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/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index e271095636..8fb31a2429 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -227,9 +227,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_test_unit_is_removed_from_frameworks_if_skip_test_unit_is_given
     run_generator [destination_root, "--skip-test-unit"]
-    assert_file "config/application.rb" do |file|
-      assert_match /config.generators.test_framework = false/, file
-    end
+    assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/
+  end
+
+  def test_no_active_record_or_test_unit_if_skips_given
+    run_generator [destination_root, "--skip-test-unit", "--skip-active-record"]
+    assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/
+    assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
   end
 
   def test_new_hash_style