From 1b816d502444ce2b3153d8c689d0057f1c257eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 29 Apr 2010 08:39:44 +0200
Subject: The rake task :environment now loads config/environment.rb instead of
 initializing the application on its own. This fixes [#4492 state:resolved]
 and also avoids the application being initialized twice in some rake tasks.

---
 railties/test/application/middleware_test.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/test/application/middleware_test.rb')

diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 27374dcb28..e9cddcc65a 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -20,6 +20,7 @@ module ApplicationTests
       assert_equal [
         "ActionDispatch::Static",
         "Rack::Lock",
+        "ActiveSupport::Cache::Strategy::LocalCache",
         "Rack::Runtime",
         "Rails::Rack::Logger",
         "ActionDispatch::ShowExceptions",
-- 
cgit v1.2.3


From 3dfcb56e4585c8530be6dcc5129ae0c4d16c0dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 29 Apr 2010 13:24:24 +0200
Subject: ActiveRecord middlewares should be inserted before AD::Cascade [#4493
 state:resolved].

---
 railties/test/application/middleware_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/test/application/middleware_test.rb')

diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index e9cddcc65a..d08f04bddb 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -27,14 +27,14 @@ module ApplicationTests
         "ActionDispatch::RemoteIp",
         "Rack::Sendfile",
         "ActionDispatch::Callbacks",
+        "ActiveRecord::ConnectionAdapters::ConnectionManagement",
+        "ActiveRecord::QueryCache",
         "ActionDispatch::Cookies",
         "ActionDispatch::Session::CookieStore",
         "ActionDispatch::Flash",
         "ActionDispatch::ParamsParser",
         "Rack::MethodOverride",
-        "ActionDispatch::Head",
-        "ActiveRecord::ConnectionAdapters::ConnectionManagement",
-        "ActiveRecord::QueryCache"
+        "ActionDispatch::Head"
       ], middleware
     end
 
-- 
cgit v1.2.3