1 files changed, 50 insertions, 0 deletions
diff --git a/railties/test/application/middleware/session_test.rb b/railties/test/application/middleware/session_test.rb
new file mode 100644
index 0000000000..07134cc935
--- /dev/null
+++ b/railties/test/application/middleware/session_test.rb
@@ -0,0 +1,50 @@
+# encoding: utf-8
+require 'isolation/abstract_unit'
+require 'rack/test'
+
+module ApplicationTests
+  class MiddlewareSessionTest < ActiveSupport::TestCase
+    include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
+
+    def setup
+      build_app
+      boot_rails
+      FileUtils.rm_rf "#{app_path}/config/environments"
+    end
+
+    def teardown
+      teardown_app
+    end
+
+    def app
+      @app ||= Rails.application
+    end
+
+    test "config.force_ssl sets cookie to secure only" do
+      add_to_config "config.force_ssl = true"
+      require "#{app_path}/config/environment"
+      assert app.config.session_options[:secure], "Expected session to be marked as secure"
+    end
+
+    test "session is not loaded if it's not used" do
+      make_basic_app
+
+      class ::OmgController < ActionController::Base
+        def index
+          if params[:flash]
+            flash[:notice] = "notice"
+          end
+
+          render :nothing => true
+        end
+      end
+
+      get "/?flash=true"
+      get "/"
+
+      assert last_request.env["HTTP_COOKIE"]
+      assert !last_response.headers["Set-Cookie"]
+    end
+  end
+end