diff options
author | Yves Senn <yves.senn@gmail.com> | 2013-07-15 05:13:39 -0700 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2013-07-15 05:13:39 -0700 |
commit | ea7620dce2127ab913dbaf7a4d369fd382623346 (patch) | |
tree | 5340cf8e131ec3e2c84889f7c4ce88df8e8484d1 /railties/test/application | |
parent | 0b61cc730ee1fd2b40acac5886a62ea91c0b3d51 (diff) | |
parent | 3b03733d9e132d44c78b74a810011299c81a2823 (diff) | |
download | rails-ea7620dce2127ab913dbaf7a4d369fd382623346.tar.gz rails-ea7620dce2127ab913dbaf7a4d369fd382623346.tar.bz2 rails-ea7620dce2127ab913dbaf7a4d369fd382623346.zip |
Merge pull request #11448 from arunagw/updated_middleware_test
No need to add config for x_sendfile_header
Diffstat (limited to 'railties/test/application')
-rw-r--r-- | railties/test/application/middleware_test.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index 0d0d072db4..31a35a09bb 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -19,7 +19,7 @@ module ApplicationTests end test "default middleware stack" do - add_to_config "config.action_dispatch.x_sendfile_header = 'X-Sendfile'" + add_to_config "config.active_record.migration_error = :page_load" boot! @@ -37,6 +37,7 @@ module ApplicationTests "ActionDispatch::RemoteIp", "ActionDispatch::Reloader", "ActionDispatch::Callbacks", + "ActiveRecord::Migration::CheckPending", "ActiveRecord::ConnectionAdapters::ConnectionManagement", "ActiveRecord::QueryCache", "ActionDispatch::Cookies", @@ -90,6 +91,7 @@ module ApplicationTests boot! assert !middleware.include?("ActiveRecord::ConnectionAdapters::ConnectionManagement") assert !middleware.include?("ActiveRecord::QueryCache") + assert !middleware.include?("ActiveRecord::Migration::CheckPending") end test "removes lock if cache classes is set" do |