aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorTaishi Kasuga <kasuga@livesense.co.jp>2015-04-09 11:21:00 +0900
committerTaishi Kasuga <kasuga@livesense.co.jp>2015-04-09 11:21:00 +0900
commit242c5c7ae4b9dbc1558ee9d673335f2b1e209188 (patch)
tree916fb131882ef6bee18ef1cdfe30c4d268ae9a27 /actionpack/lib
parent8c8e9b34d576d2b223345d9073aca28c7975ecd7 (diff)
downloadrails-242c5c7ae4b9dbc1558ee9d673335f2b1e209188.tar.gz
rails-242c5c7ae4b9dbc1558ee9d673335f2b1e209188.tar.bz2
rails-242c5c7ae4b9dbc1558ee9d673335f2b1e209188.zip
fix fails to force_ssl_redirection if session_store is disabled
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/force_ssl.rb2
-rw-r--r--actionpack/lib/action_controller/test_case.rb7
2 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb
index d920668184..5a8c7db162 100644
--- a/actionpack/lib/action_controller/metal/force_ssl.rb
+++ b/actionpack/lib/action_controller/metal/force_ssl.rb
@@ -89,7 +89,7 @@ module ActionController
end
secure_url = ActionDispatch::Http::URL.url_for(options.slice(*URL_OPTIONS))
- flash.keep if respond_to?(:flash)
+ flash.keep if request.respond_to?(:flash)
redirect_to secure_url, options.slice(*REDIRECT_OPTIONS)
end
end
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 33c24999f9..6ffd7a7d2b 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -659,7 +659,9 @@ module ActionController
@request.assign_parameters(@routes, controller_class_name, action.to_s, parameters)
@request.session.update(session) if session
- @request.flash.update(flash || {})
+
+ is_request_flash_enabled = @request.respond_to?(:flash)
+ @request.flash.update(flash || {}) if is_request_flash_enabled
if xhr
@request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
@@ -685,7 +687,8 @@ module ActionController
@assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {}
- if flash_value = @request.flash.to_session_value
+ flash_value = is_request_flash_enabled ? @request.flash.to_session_value : nil
+ if flash_value
@request.session['flash'] = flash_value
else
@request.session.delete('flash')