From 896521be73095c53291df56fc1ab4f51c9a5eb6e Mon Sep 17 00:00:00 2001
From: Ulisses Almeida <anizark@gmail.com>
Date: Tue, 26 Apr 2016 18:11:54 -0300
Subject: [PATCH] Se the new default for skip_session_storage config

---
 lib/devise.rb                                 | 16 ++--------------
 test/devise_test.rb                           |  9 +++------
 test/integration/http_authenticatable_test.rb | 14 ++++++++------
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/lib/devise.rb b/lib/devise.rb
index bce7e94c..05b52896 100755
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -206,19 +206,8 @@ module Devise
   @@mailer_sender = nil
 
   # Skip session storage for the following strategies
-  # TODO: 4.1 Do: @@skip_session_storage = [:http_auth]
-  mattr_reader :skip_session_storage
-  @@skip_session_storage = []
-
-  def self.skip_session_storage=(skip_session_storage)
-    app_set_configs << :skip_session_storage
-    @@skip_session_storage = skip_session_storage
-  end
-
-  def skip_session_storage=(skip_session_storage)
-    app_set_configs << :skip_session_storage
-    @@skip_session_storage = skip_session_storage
-  end
+  mattr_accessor :skip_session_storage
+  @@skip_session_storage = [:http_auth]
 
   # Which formats should be treated as navigational.
   mattr_accessor :navigational_formats
@@ -308,7 +297,6 @@ module Devise
     yield self
 
     warn_default_config_changed(:sign_out_via, ':get', ':delete')
-    warn_default_config_changed(:skip_session_storage, '[]', '[:http_auth]')
   end
 
   def self.warn_default_config_changed(config, current_default, new_default)
diff --git a/test/devise_test.rb b/test/devise_test.rb
index 4c0b1efe..60f351bd 100755
--- a/test/devise_test.rb
+++ b/test/devise_test.rb
@@ -39,7 +39,6 @@ class DeviseTest < ActiveSupport::TestCase
     Devise.app_set_configs = Set.new
 
     ActiveSupport::Deprecation.expects(:warn).with() { |value| value =~ /sign_out_via/ }
-    ActiveSupport::Deprecation.expects(:warn).with() { |value| value =~ /skip_session_storage/ }
 
     Devise.setup do
     end
@@ -48,11 +47,9 @@ class DeviseTest < ActiveSupport::TestCase
   test 'setup block doest not warns when the change is explicit set' do
     ActiveSupport::Deprecation.expects(:warn).never
 
-    swap Devise,
-        sign_out_via: :get,
-        skip_session_storage: [] do
-        Devise.setup do
-        end
+    swap Devise, sign_out_via: :get do
+      Devise.setup do
+      end
     end
   end
 
diff --git a/test/integration/http_authenticatable_test.rb b/test/integration/http_authenticatable_test.rb
index 37c17efb..a57901cc 100644
--- a/test/integration/http_authenticatable_test.rb
+++ b/test/integration/http_authenticatable_test.rb
@@ -11,13 +11,15 @@ class HttpAuthenticationTest < Devise::IntegrationTest
   end
 
   test 'sign in should authenticate with http' do
-    sign_in_as_new_user_with_http
-    assert_response 200
-    assert_match '<email>user@test.com</email>', response.body
-    assert warden.authenticated?(:user)
+    swap Devise, skip_session_storage: [] do
+      sign_in_as_new_user_with_http
+      assert_response 200
+      assert_match '<email>user@test.com</email>', response.body
+      assert warden.authenticated?(:user)
 
-    get users_path(format: :xml)
-    assert_response 200
+      get users_path(format: :xml)
+      assert_response 200
+    end
   end
 
   test 'sign in should authenticate with http but not emit a cookie if skipping session storage' do