diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb index d7f4f09665..bfa66770bd 100644 --- a/railties/test/application/loading_test.rb +++ b/railties/test/application/loading_test.rb @@ -371,7 +371,7 @@ def test_initialize_can_be_called_at_any_time end end - test "active record query cache hooks are installed before first request" do + test "active record query cache hooks are installed before first request in production" do app_file "app/controllers/omg_controller.rb", <<-RUBY begin class OmgController < ActionController::Metal @@ -395,7 +395,40 @@ def show end RUBY - require "#{rails_root}/config/environment" + boot_app "production" + + require "rack/test" + extend Rack::Test::Methods + + get "/omg/show" + assert_equal "Query cache is enabled.", last_response.body + end + + test "active record query cache hooks are installed before first request in development" do + app_file "app/controllers/omg_controller.rb", <<-RUBY + begin + class OmgController < ActionController::Metal + ActiveSupport.run_load_hooks(:action_controller, self) + def show + if ActiveRecord::Base.connection.query_cache_enabled + self.response_body = ["Query cache is enabled."] + else + self.response_body = ["Expected ActiveRecord::Base.connection.query_cache_enabled to be true"] + end + end + end + rescue => e + puts "Error loading metal: \#{e.class} \#{e.message}" + end + RUBY + + app_file "config/routes.rb", <<-RUBY + Rails.application.routes.draw do + get "/:controller(/:action)" + end + RUBY + + boot_app "development" require "rack/test" extend Rack::Test::Methods @@ -415,4 +448,12 @@ def setup_ar! end end end + + def boot_app(env = "development") + ENV["RAILS_ENV"] = env + + require "#{app_path}/config/environment" + ensure + ENV.delete "RAILS_ENV" + end end