diff options
Diffstat (limited to 'actionpack/test/new_base/views/with_both_layouts')
3 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/new_base/views/with_both_layouts/happy_path/render_action_with_controller_layout_first/hello_world.html.erb b/actionpack/test/new_base/views/with_both_layouts/happy_path/render_action_with_controller_layout_first/hello_world.html.erb new file mode 100644 index 0000000000..c57eff55eb --- /dev/null +++ b/actionpack/test/new_base/views/with_both_layouts/happy_path/render_action_with_controller_layout_first/hello_world.html.erb @@ -0,0 +1 @@ +Hello World!
\ No newline at end of file diff --git a/actionpack/test/new_base/views/with_both_layouts/layouts/application.html.erb b/actionpack/test/new_base/views/with_both_layouts/layouts/application.html.erb new file mode 100644 index 0000000000..25f839fded --- /dev/null +++ b/actionpack/test/new_base/views/with_both_layouts/layouts/application.html.erb @@ -0,0 +1 @@ +OHAI <%= yield %> KTHXBAI
\ No newline at end of file diff --git a/actionpack/test/new_base/views/with_both_layouts/layouts/happy_path/render_action_with_controller_layout_first.html.erb b/actionpack/test/new_base/views/with_both_layouts/layouts/happy_path/render_action_with_controller_layout_first.html.erb new file mode 100644 index 0000000000..43d89fde52 --- /dev/null +++ b/actionpack/test/new_base/views/with_both_layouts/layouts/happy_path/render_action_with_controller_layout_first.html.erb @@ -0,0 +1 @@ +With Controller Layout! <%= yield %> KTHXBAI
\ No newline at end of file |