diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-01-15 14:06:57 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-01-15 14:37:39 +0900 |
| commit | 761afeb2bb1b674314fb53f691b07c9261949fc3 (patch) | |
| tree | 8bee9b2fa22df3139a0769492097f82267ac070e /actionpack/test | |
| parent | aaece61a53dc943ac0e4b696c39ba61f46b7c7a3 (diff) | |
| download | rails-761afeb2bb1b674314fb53f691b07c9261949fc3.tar.gz rails-761afeb2bb1b674314fb53f691b07c9261949fc3.tar.bz2 rails-761afeb2bb1b674314fb53f691b07c9261949fc3.zip | |
make `render` work with AC::Params
In 4.2, since AC::Params inherited `Hash`, processing in the case of
`Hash` was done. But in 5.x, since AC::Params does not inherit `Hash`,
need to add care for AC::Params.
Related to 00285e7cf75c96553719072a27c27e4ab7d25b40
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 0c0f18f200..3a0a0a8bde 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -313,7 +313,6 @@ class ExpiresInRenderTest < ActionController::TestCase end def test_permitted_dynamic_render_file_hash - skip "FIXME: this test passes on 4-2-stable but not master. Why?" assert File.exist?(File.join(File.dirname(__FILE__), "../../test/abstract_unit.rb")) response = get :dynamic_render_permit, params: { id: { file: '../\\../test/abstract_unit.rb' } } assert_equal File.read(File.join(File.dirname(__FILE__), "../../test/abstract_unit.rb")), |