aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-08-16 11:19:20 -0700
committerXavier Noria <fxn@hashref.com>2011-08-16 11:19:20 -0700
commit98fac9902b3cc8984ad6645e0db390fb8cb55098 (patch)
treea8160d245864a3244b44fd7d29c613dc137a29c7 /actionpack/test
parent0245792c833c8b13fe53f8ae9f477b63dab928b6 (diff)
parent8e236152457ed48bb436e9bffb4c5d6d4b6a26d4 (diff)
downloadrails-98fac9902b3cc8984ad6645e0db390fb8cb55098.tar.gz
rails-98fac9902b3cc8984ad6645e0db390fb8cb55098.tar.bz2
rails-98fac9902b3cc8984ad6645e0db390fb8cb55098.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/params_wrapper_test.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index e1914cf894..7bef1e8d5d 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -180,13 +180,6 @@ class ParamsWrapperTest < ActionController::TestCase
assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu', 'title' => 'Developer' }})
end
end
-
- def test_assignment_alias
- with_default_wrapper_options do
- UsersController.wrap_parameters = { :format => [:foo] }
- assert_equal({ :format => [:foo], :name => "user" }, UsersController._wrapper_options)
- end
- end
end
class NamespacedParamsWrapperTest < ActionController::TestCase