diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-17 10:25:26 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-17 10:25:26 -0700 |
| commit | adadd865a2688f31146c877fbeea1269a15d41f4 (patch) | |
| tree | 280c1871410363b6bd16b5efe6af12373b615180 /railties/test | |
| parent | 6ce54d4ba8c220a84e55e7dd798d364c3f48d9f7 (diff) | |
| parent | da5a47e7b9cd438c68276ad0886f9bb1260867b0 (diff) | |
| download | rails-adadd865a2688f31146c877fbeea1269a15d41f4.tar.gz rails-adadd865a2688f31146c877fbeea1269a15d41f4.tar.bz2 rails-adadd865a2688f31146c877fbeea1269a15d41f4.zip | |
Merge pull request #5488 from rafaelfranca/ad-ssl
Remove Rack::SSL in favour of ActionDispatch::SSL
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/middleware_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index 2f62d978e3..fc5fb60174 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -66,13 +66,13 @@ module ApplicationTests assert_equal "Rack::Cache", middleware.first end - test "Rack::SSL is present when force_ssl is set" do + test "ActionDispatch::SSL is present when force_ssl is set" do add_to_config "config.force_ssl = true" boot! - assert middleware.include?("Rack::SSL") + assert middleware.include?("ActionDispatch::SSL") end - test "Rack::SSL is configured with options when given" do + test "ActionDispatch::SSL is configured with options when given" do add_to_config "config.force_ssl = true" add_to_config "config.ssl_options = { :host => 'example.com' }" boot! |