diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-01-16 10:09:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-16 10:09:56 -0500 |
| commit | bc33fe551251cbbcce62d78f240746357c979fb8 (patch) | |
| tree | 195c8093292f51578a527d89b2a716c3d05744d3 /actionpack/test/controller | |
| parent | 39c1da1316dada5f7b2adda39a1dbbba06a06442 (diff) | |
| parent | 761afeb2bb1b674314fb53f691b07c9261949fc3 (diff) | |
| download | rails-bc33fe551251cbbcce62d78f240746357c979fb8.tar.gz rails-bc33fe551251cbbcce62d78f240746357c979fb8.tar.bz2 rails-bc33fe551251cbbcce62d78f240746357c979fb8.zip | |
Merge pull request #27692 from y-yagi/make_render_work_with_ac_params
make `render` work with AC::Params
Diffstat (limited to 'actionpack/test/controller')
| -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")), |