diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-08-09 23:53:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 23:53:54 +0200 |
| commit | 7b31b06d4afd73734ac54cbbac105f0eab8d0d43 (patch) | |
| tree | 94789c1c7f3c8e1c611a30548cd90ecbb34f98ea /actionpack/test/controller/new_base/render_action_test.rb | |
| parent | 67d0c9ee93100dbdcafd20b0632e5bef6735888e (diff) | |
| parent | f006de5dc5a709f5dc8604ebd43f7741da30cd9f (diff) | |
| download | rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.gz rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.bz2 rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.zip | |
Merge pull request #26095 from kamipo/fix_broken_alignment_by_auto_correct
Fix broken alignments caused by auto-correct commit 411ccbd
Diffstat (limited to 'actionpack/test/controller/new_base/render_action_test.rb')
| -rw-r--r-- | actionpack/test/controller/new_base/render_action_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/controller/new_base/render_action_test.rb b/actionpack/test/controller/new_base/render_action_test.rb index e88f83b594..4b59a3d676 100644 --- a/actionpack/test/controller/new_base/render_action_test.rb +++ b/actionpack/test/controller/new_base/render_action_test.rb @@ -258,7 +258,8 @@ end module RenderActionWithBothLayouts class BasicController < ActionController::Base - self.view_paths = [ActionView::FixtureResolver.new( "render_action_with_both_layouts/basic/hello_world.html.erb" => "Hello World!", + self.view_paths = [ActionView::FixtureResolver.new( + "render_action_with_both_layouts/basic/hello_world.html.erb" => "Hello World!", "layouts/application.html.erb" => "Oh Hi <%= yield %> Bye", "layouts/render_action_with_both_layouts/basic.html.erb" => "With Controller Layout! <%= yield %> Bye")] |