diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-19 12:55:31 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-19 12:55:31 -0800 |
| commit | 16bd0cb1f08569402cccc9b7f00f0b274e327eb9 (patch) | |
| tree | 9ef1dda909373e556c8ccec5664196ed2f5536e3 /actionpack/test | |
| parent | 0a3f57e85a0825f31d93303eb6f2c7f40fce57f8 (diff) | |
| parent | 1b4edd173dc2cbe53e48777d3e17be3164513539 (diff) | |
| download | rails-16bd0cb1f08569402cccc9b7f00f0b274e327eb9.tar.gz rails-16bd0cb1f08569402cccc9b7f00f0b274e327eb9.tar.bz2 rails-16bd0cb1f08569402cccc9b7f00f0b274e327eb9.zip | |
Merge pull request #4546 from carlosantoniodasilva/response-body-performed
Use performed? instead of checking for response_body
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/force_ssl_test.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb index 125012631e..3ea3c06ac4 100644 --- a/actionpack/test/controller/force_ssl_test.rb +++ b/actionpack/test/controller/force_ssl_test.rb @@ -39,10 +39,8 @@ class ForceSSLFlash < ForceSSLController @flashy = flash["that"] render :inline => "hello" end - end - class ForceSSLControllerLevelTest < ActionController::TestCase tests ForceSSLControllerLevel @@ -135,5 +133,4 @@ class ForceSSLFlashTest < ActionController::TestCase assert_equal "hello", assigns["flash_copy"]["that"] assert_equal "hello", assigns["flashy"] end - end |