Merge branch 'master' into cherry

1 files changed, 0 insertions, 58 deletions

diff --git a/actionpack/test/controller/session/test_session_test.rb b/actionpack/test/controller/session/test_session_test.rb
deleted file mode 100644
index de6539e1cc..0000000000
--- a/actionpack/test/controller/session/test_session_test.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'abstract_unit'
-require 'stringio'
-
-class ActionController::TestSessionTest < ActiveSupport::TestCase
-  
-  def test_calling_delete_without_parameters_raises_deprecation_warning_and_calls_to_clear_test_session
-    assert_deprecated(/use clear instead/){ ActionController::TestSession.new.delete }
-  end
-  
-  def test_calling_update_without_parameters_raises_deprecation_warning_and_calls_to_clear_test_session
-    assert_deprecated(/use replace instead/){ ActionController::TestSession.new.update }
-  end
-  
-  def test_calling_close_raises_deprecation_warning
-    assert_deprecated(/sessions should no longer be closed/){ ActionController::TestSession.new.close }
-  end
-  
-  def test_defaults
-    session = ActionController::TestSession.new
-    assert_equal({}, session.data)
-    assert_equal('', session.session_id)
-  end
-  
-  def test_ctor_allows_setting
-    session = ActionController::TestSession.new({:one => 'one', :two => 'two'})
-    assert_equal('one', session[:one])
-    assert_equal('two', session[:two])
-  end
-  
-  def test_setting_session_item_sets_item
-    session = ActionController::TestSession.new
-    session[:key] = 'value'
-    assert_equal('value', session[:key])
-  end
-  
-  def test_calling_delete_removes_item
-    session = ActionController::TestSession.new
-    session[:key] = 'value'
-    assert_equal('value', session[:key])
-    session.delete(:key)
-    assert_nil(session[:key])
-  end
-  
-  def test_calling_update_with_params_passes_to_attributes
-    session = ActionController::TestSession.new()
-    session.update('key' => 'value')
-    assert_equal('value', session[:key])
-  end
-  
-  def test_clear_emptys_session
-    params = {:one => 'one', :two => 'two'}
-    session = ActionController::TestSession.new({:one => 'one', :two => 'two'})
-    session.clear
-    assert_nil(session[:one])
-    assert_nil(session[:two])
-  end
-  
-end
\ No newline at end of file