From c9ef9c1442f0b33a0641466398801aa69ce141f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?= Date: Wed, 7 Aug 2013 00:18:52 +0200 Subject: Move remaining layouts tests to AV --- actionview/test/fixtures/actionpack/layout_tests/alt/layouts/alt.erb | 0 .../actionpack/layout_tests/layouts/controller_name_space/nested.erb | 1 + actionview/test/fixtures/actionpack/layout_tests/layouts/item.erb | 1 + .../test/fixtures/actionpack/layout_tests/layouts/layout_test.erb | 1 + .../actionpack/layout_tests/layouts/multiple_extensions.html.erb | 1 + .../actionpack/layout_tests/layouts/symlinked/symlinked_layout.erb | 5 +++++ .../actionpack/layout_tests/layouts/third_party_template_library.mab | 1 + actionview/test/fixtures/actionpack/layout_tests/views/goodbye.erb | 1 + actionview/test/fixtures/actionpack/layout_tests/views/hello.erb | 1 + actionview/test/fixtures/actionpack/layouts/_column.html.erb | 2 ++ actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb | 2 ++ actionview/test/fixtures/actionpack/layouts/_yield_only.erb | 1 + actionview/test/fixtures/actionpack/layouts/_yield_with_params.erb | 1 + actionview/test/fixtures/actionpack/layouts/streaming.erb | 4 ++++ .../fixtures/actionpack/layouts/yield_with_render_inline_inside.erb | 2 ++ .../fixtures/actionpack/layouts/yield_with_render_partial_inside.erb | 2 ++ 16 files changed, 26 insertions(+) create mode 100644 actionview/test/fixtures/actionpack/layout_tests/alt/layouts/alt.erb create mode 100644 actionview/test/fixtures/actionpack/layout_tests/layouts/controller_name_space/nested.erb create mode 100644 actionview/test/fixtures/actionpack/layout_tests/layouts/item.erb create mode 100644 actionview/test/fixtures/actionpack/layout_tests/layouts/layout_test.erb create mode 100644 actionview/test/fixtures/actionpack/layout_tests/layouts/multiple_extensions.html.erb create mode 100644 actionview/test/fixtures/actionpack/layout_tests/layouts/symlinked/symlinked_layout.erb create mode 100644 actionview/test/fixtures/actionpack/layout_tests/layouts/third_party_template_library.mab create mode 100644 actionview/test/fixtures/actionpack/layout_tests/views/goodbye.erb create mode 100644 actionview/test/fixtures/actionpack/layout_tests/views/hello.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/_column.html.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/_yield_only.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/_yield_with_params.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/streaming.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/yield_with_render_inline_inside.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/yield_with_render_partial_inside.erb (limited to 'actionview/test/fixtures/actionpack') diff --git a/actionview/test/fixtures/actionpack/layout_tests/alt/layouts/alt.erb b/actionview/test/fixtures/actionpack/layout_tests/alt/layouts/alt.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/actionview/test/fixtures/actionpack/layout_tests/layouts/controller_name_space/nested.erb b/actionview/test/fixtures/actionpack/layout_tests/layouts/controller_name_space/nested.erb new file mode 100644 index 0000000000..121bc079a1 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layout_tests/layouts/controller_name_space/nested.erb @@ -0,0 +1 @@ +controller_name_space/nested.erb <%= yield %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layout_tests/layouts/item.erb b/actionview/test/fixtures/actionpack/layout_tests/layouts/item.erb new file mode 100644 index 0000000000..60f04d77d5 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layout_tests/layouts/item.erb @@ -0,0 +1 @@ +item.erb <%= yield %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layout_tests/layouts/layout_test.erb b/actionview/test/fixtures/actionpack/layout_tests/layouts/layout_test.erb new file mode 100644 index 0000000000..b74ac0840d --- /dev/null +++ b/actionview/test/fixtures/actionpack/layout_tests/layouts/layout_test.erb @@ -0,0 +1 @@ +layout_test.erb <%= yield %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layout_tests/layouts/multiple_extensions.html.erb b/actionview/test/fixtures/actionpack/layout_tests/layouts/multiple_extensions.html.erb new file mode 100644 index 0000000000..3b65e54f9c --- /dev/null +++ b/actionview/test/fixtures/actionpack/layout_tests/layouts/multiple_extensions.html.erb @@ -0,0 +1 @@ +multiple_extensions.html.erb <%= yield %> diff --git a/actionview/test/fixtures/actionpack/layout_tests/layouts/symlinked/symlinked_layout.erb b/actionview/test/fixtures/actionpack/layout_tests/layouts/symlinked/symlinked_layout.erb new file mode 100644 index 0000000000..bda57d0fae --- /dev/null +++ b/actionview/test/fixtures/actionpack/layout_tests/layouts/symlinked/symlinked_layout.erb @@ -0,0 +1,5 @@ +This is my layout + +<%= yield %> + +End. diff --git a/actionview/test/fixtures/actionpack/layout_tests/layouts/third_party_template_library.mab b/actionview/test/fixtures/actionpack/layout_tests/layouts/third_party_template_library.mab new file mode 100644 index 0000000000..fcee620d82 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layout_tests/layouts/third_party_template_library.mab @@ -0,0 +1 @@ +layouts/third_party_template_library.mab \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layout_tests/views/goodbye.erb b/actionview/test/fixtures/actionpack/layout_tests/views/goodbye.erb new file mode 100644 index 0000000000..4ee911188e --- /dev/null +++ b/actionview/test/fixtures/actionpack/layout_tests/views/goodbye.erb @@ -0,0 +1 @@ +hello.erb \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layout_tests/views/hello.erb b/actionview/test/fixtures/actionpack/layout_tests/views/hello.erb new file mode 100644 index 0000000000..4ee911188e --- /dev/null +++ b/actionview/test/fixtures/actionpack/layout_tests/views/hello.erb @@ -0,0 +1 @@ +hello.erb \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layouts/_column.html.erb b/actionview/test/fixtures/actionpack/layouts/_column.html.erb new file mode 100644 index 0000000000..96db002b8a --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/_column.html.erb @@ -0,0 +1,2 @@ +
<%= yield :column %>
+
<%= yield %>
\ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb b/actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb new file mode 100644 index 0000000000..74cc428ffa --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb @@ -0,0 +1,2 @@ +<%= render :partial => 'test/partial' %> +<%= yield %> diff --git a/actionview/test/fixtures/actionpack/layouts/_yield_only.erb b/actionview/test/fixtures/actionpack/layouts/_yield_only.erb new file mode 100644 index 0000000000..37f0bddbd7 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/_yield_only.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/actionview/test/fixtures/actionpack/layouts/_yield_with_params.erb b/actionview/test/fixtures/actionpack/layouts/_yield_with_params.erb new file mode 100644 index 0000000000..68e6557fb8 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/_yield_with_params.erb @@ -0,0 +1 @@ +<%= yield 'Yield!' %> diff --git a/actionview/test/fixtures/actionpack/layouts/streaming.erb b/actionview/test/fixtures/actionpack/layouts/streaming.erb new file mode 100644 index 0000000000..d3f896a6ca --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/streaming.erb @@ -0,0 +1,4 @@ +<%= yield :header -%> +<%= yield -%> +<%= yield :footer -%> +<%= yield(:unknown).presence || "." -%> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layouts/yield_with_render_inline_inside.erb b/actionview/test/fixtures/actionpack/layouts/yield_with_render_inline_inside.erb new file mode 100644 index 0000000000..7298d79690 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/yield_with_render_inline_inside.erb @@ -0,0 +1,2 @@ +<%= render :inline => 'welcome' %> +<%= yield %> diff --git a/actionview/test/fixtures/actionpack/layouts/yield_with_render_partial_inside.erb b/actionview/test/fixtures/actionpack/layouts/yield_with_render_partial_inside.erb new file mode 100644 index 0000000000..74cc428ffa --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/yield_with_render_partial_inside.erb @@ -0,0 +1,2 @@ +<%= render :partial => 'test/partial' %> +<%= yield %> -- cgit v1.2.3