aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/integration_test.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-24 01:34:49 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-24 17:19:42 -0300
commit3de95fd9303ea2a2ffa5184f8cf32db63cb7f4ac (patch)
tree38e6d7d3e074aabe1aa5d2c0be6965aeb0d2414b /actionpack/test/controller/integration_test.rb
parente69011521da0a9d4559436da21ea030465e54d08 (diff)
downloadrails-3de95fd9303ea2a2ffa5184f8cf32db63cb7f4ac.tar.gz
rails-3de95fd9303ea2a2ffa5184f8cf32db63cb7f4ac.tar.bz2
rails-3de95fd9303ea2a2ffa5184f8cf32db63cb7f4ac.zip
Revert "Make process reuse the env var passed as argument"
This reverts commit 0e4748cd415660eb91e63d50aa15cdd027c612dd.
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
-rw-r--r--actionpack/test/controller/integration_test.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 23709e44e2..2ad95f5c29 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -493,7 +493,7 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
routes.draw do
match '', :to => 'application_integration_test/test#index', :as => :empty_string
-
+
match 'foo', :to => 'application_integration_test/test#index', :as => :foo
match 'bar', :to => 'application_integration_test/test#index', :as => :bar
end
@@ -511,7 +511,7 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
test "route helpers after controller access" do
get '/'
assert_equal '/', empty_string_path
-
+
get '/foo'
assert_equal '/foo', foo_path
@@ -528,11 +528,10 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
assert_raise(NameError) { missing_path }
end
- test "process reuse the env we pass as argument" do
+ test "process do not modify the env passed as argument" do
env = { :SERVER_NAME => 'server', 'action_dispatch.custom' => 'custom' }
+ old_env = env.dup
get '/foo', nil, env
- assert_equal :get, env[:method]
- assert_equal 'server', env[:SERVER_NAME]
- assert_equal 'custom', env['action_dispatch.custom']
+ assert_equal old_env, env
end
end