diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-02-24 11:26:49 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-02-24 11:26:49 +1030 |
| commit | 52bcbde60d101536d531337b9edb83a94604bc74 (patch) | |
| tree | 4b5b82039ba96581e872d035df295c4b2ee54016 /actionpack/test | |
| parent | 2c02bc0a47777ad8cf98e1465c08b1a68151803e (diff) | |
| parent | 6edfcdd4aa896dbbf431fcf3992e0d1cd2dac3b2 (diff) | |
| download | rails-52bcbde60d101536d531337b9edb83a94604bc74.tar.gz rails-52bcbde60d101536d531337b9edb83a94604bc74.tar.bz2 rails-52bcbde60d101536d531337b9edb83a94604bc74.zip | |
Merge pull request #23632 from maclover7/fix-23620
Fix `request.ssl?` bug with Action Cable
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/force_ssl_test.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb index 22f1cc7c22..03a9c9ae78 100644 --- a/actionpack/test/controller/force_ssl_test.rb +++ b/actionpack/test/controller/force_ssl_test.rb @@ -322,3 +322,12 @@ class RedirectToSSLTest < ActionController::TestCase assert_equal 'ihaz', response.body end end + +class ForceSSLControllerLevelTest < ActionController::TestCase + def test_no_redirect_websocket_ssl_request + request.env['rack.url_scheme'] = 'wss' + request.env['Upgrade'] = 'websocket' + get :cheeseburger + assert_response 200 + end +end |