From 25f7c030e4ea440ea6c2a84c92118299753392d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 18 May 2010 01:43:06 +0200
Subject: Simplify cookie_store by simply relying on cookies.signed.

---
 railties/lib/rails/application/configuration.rb | 8 ++------
 railties/test/application/configuration_test.rb | 4 ++--
 railties/test/application/middleware_test.rb    | 5 ++++-
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 8afe423973..1b8af370f7 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -11,7 +11,8 @@ module Rails
                     :encoding, :consider_all_requests_local, :dependency_loading,
                     :filter_parameters,  :log_level, :logger, :metals,
                     :plugins, :preload_frameworks, :reload_engines, :reload_plugins,
-                    :secret_token, :serve_static_assets, :time_zone, :whiny_nils
+                    :secret_token, :serve_static_assets, :session_options,
+                    :time_zone, :whiny_nils
 
       def initialize(*)
         super
@@ -138,11 +139,6 @@ module Rails
         end
       end
 
-      def session_options
-        return @session_options unless @session_store == :cookie_store
-        @session_options.merge(:secret => @secret_token)
-      end
-
     protected
 
       def default_middleware_stack
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index c08bd2ef22..9928ee2c52 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -196,7 +196,7 @@ module ApplicationTests
 
     test "config.secret_token is sent in env" do
       make_basic_app do |app|
-        app.config.secret_token = 'ThisIsASECRET123'
+        app.config.secret_token = 'b3c631c314c0bbca50c1b2843150fe33'
         app.config.session_store :disabled
       end
 
@@ -208,7 +208,7 @@ module ApplicationTests
       end
 
       get "/"
-      assert_equal 'ThisIsASECRET123', last_response.body
+      assert_equal 'b3c631c314c0bbca50c1b2843150fe33', last_response.body
     end
 
     test "protect from forgery is the default in a new app" do
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index d08f04bddb..617525bf78 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -175,7 +175,10 @@ module ApplicationTests
 
       def remote_ip(env = {})
         remote_ip = nil
-        env = Rack::MockRequest.env_for("/").merge(env).merge('action_dispatch.show_exceptions' => false)
+        env = Rack::MockRequest.env_for("/").merge(env).merge!(
+          'action_dispatch.show_exceptions' => false,
+          'action_dispatch.secret_token' => 'b3c631c314c0bbca50c1b2843150fe33'
+        )
 
         endpoint = Proc.new do |e|
           remote_ip = ActionDispatch::Request.new(e).remote_ip
-- 
cgit v1.2.3