Changeset 8783

Timestamp:

02/02/08 05:34:28 (5 months ago)

Author:

bitsweat

Message:

Merge r8782 from trunk: TestSession supports indifferent access. References #7372.

Files:

• branches/2-0-stable/actionpack/CHANGELOG (modified) (1 diff)
• branches/2-0-stable/actionpack/lib/action_controller/test_process.rb (modified) (2 diffs)
• branches/2-0-stable/actionpack/test/controller/test_test.rb (modified) (2 diffs)

branches/2-0-stable/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* TestSession supports indifferent access.  #7372 [tamc, Arsen7, mhackett, julik, jean.helou]
-
-* UrlWriter respects relative_url_root.  #10748 [Cheah Chu Yeow]

branches/2-0-stable/actionpack/lib/action_controller/test_process.rb

@@ -287 +287 @@
-    def initialize(attributes = nil)
-      @session_id = ''
-
+.nil? ? nil : attributes.stringify_keys
-      @saved_attributes = nil
-    end
@@ -296 +296 @@
-
-    def [](key)
-
+.to_s
-    end
-
-    def []=(key, value)
-
+.to_s
-    end
-

branches/2-0-stable/actionpack/test/controller/test_test.rb

@@ -5 +5 @@
-class TestTest < Test::Unit::TestCase
-  class TestController < ActionController::Base
+    def no_op
+      render :text => 'dummy'
+    end
+
-    def set_flash
-      flash["test"] = ">#{flash["test"]}<"
-      render :text => 'ignore me'
+    end
+
+    def set_session
+      session['string'] = 'A wonder'
+      session[:symbol] = 'it works'
+      render :text => 'Success'
-    end
-
@@ -137 +147 @@
-  end
-
+  def test_process_with_session
+    process :set_session
+    assert_equal 'A wonder', session['string'], "A value stored in the session should be available by string key"
+    assert_equal 'A wonder', session[:string], "Test session hash should allow indifferent access"
+    assert_equal 'it works', session['symbol'], "Test session hash should allow indifferent access"
+    assert_equal 'it works', session[:symbol], "Test session hash should allow indifferent access"
+  end
+
+  def test_process_with_session_arg
+    process :no_op, nil, { 'string' => 'value1', :symbol => 'value2' }
+    assert_equal 'value1', session['string']
+    assert_equal 'value1', session[:string]
+    assert_equal 'value2', session['symbol']
+    assert_equal 'value2', session[:symbol]
+  end
+
-  def test_process_with_request_uri_with_no_params
-    process :test_uri