Merge pull request rails#27140 from supercaracal/fix-force-ssl-if-session-store-disabled

Fix a force ssl redirection bug that occur when session store disabled.

Author: rafaelfranca

actionpack/lib/action_controller/metal/force_ssl.rb

@@ -89,7 +89,7 @@ def force_ssl_redirect(host_or_options = nil)
         end
 
         secure_url = ActionDispatch::Http::URL.url_for(options.slice(*URL_OPTIONS))
-        flash.keep if respond_to?(:flash)
+        flash.keep if respond_to?(:flash) && request.respond_to?(:flash)
         redirect_to secure_url, options.slice(*REDIRECT_OPTIONS)
       end
     end

railties/test/application/configuration_test.rb

@@ -1532,5 +1532,24 @@ def index
 
       assert_equal :default, Rails.configuration.debug_exception_response_format
     end
+
+    test "controller force_ssl declaration can be used even if session_store is disabled" do
+      make_basic_app do |application|
+        application.config.session_store :disabled
+      end
+
+      class ::OmgController < ActionController::Base
+        force_ssl
+
+        def index
+          render plain: "Yay! You're on Rails!"
+        end
+      end
+
+      get "/"
+
+      assert_equal 301, last_response.status
+      assert_equal "https://example.org/", last_response.location
+    end
   end
 end

railties/test/isolation/abstract_unit.rb

@@ -162,7 +162,6 @@ def make_basic_app
       require "rails"
       require "action_controller/railtie"
       require "action_view/railtie"
-      require "action_dispatch/middleware/flash"
 
       @app = Class.new(Rails::Application)
       @app.config.eager_load = false