From d1157e7242d248b37546800bf7816c3035b56ce8 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Fri, 27 Feb 2009 11:42:13 -0800 Subject: AbstractController now supports layouts and rendering --- .../views/abstract_controller/testing/me3/formatted.html.erb | 1 + .../abstract_controller/views/abstract_controller/testing/me3/index.erb | 1 + .../abstract_controller/views/abstract_controller/testing/me4/index.erb | 1 + .../abstract_controller/views/abstract_controller/testing/me5/index.erb | 1 + actionpack/test/abstract_controller/views/action_with_ivars.erb | 1 + .../views/layouts/abstract_controller/testing/me4.erb | 1 + actionpack/test/abstract_controller/views/layouts/application.erb | 1 + actionpack/test/abstract_controller/views/naked_render.erb | 1 + 8 files changed, 8 insertions(+) create mode 100644 actionpack/test/abstract_controller/views/abstract_controller/testing/me3/formatted.html.erb create mode 100644 actionpack/test/abstract_controller/views/abstract_controller/testing/me3/index.erb create mode 100644 actionpack/test/abstract_controller/views/abstract_controller/testing/me4/index.erb create mode 100644 actionpack/test/abstract_controller/views/abstract_controller/testing/me5/index.erb create mode 100644 actionpack/test/abstract_controller/views/action_with_ivars.erb create mode 100644 actionpack/test/abstract_controller/views/layouts/abstract_controller/testing/me4.erb create mode 100644 actionpack/test/abstract_controller/views/layouts/application.erb create mode 100644 actionpack/test/abstract_controller/views/naked_render.erb (limited to 'actionpack/test/abstract_controller/views') diff --git a/actionpack/test/abstract_controller/views/abstract_controller/testing/me3/formatted.html.erb b/actionpack/test/abstract_controller/views/abstract_controller/testing/me3/formatted.html.erb new file mode 100644 index 0000000000..785bf69191 --- /dev/null +++ b/actionpack/test/abstract_controller/views/abstract_controller/testing/me3/formatted.html.erb @@ -0,0 +1 @@ +Hello from me3/formatted.html.erb \ No newline at end of file diff --git a/actionpack/test/abstract_controller/views/abstract_controller/testing/me3/index.erb b/actionpack/test/abstract_controller/views/abstract_controller/testing/me3/index.erb new file mode 100644 index 0000000000..f079ad8204 --- /dev/null +++ b/actionpack/test/abstract_controller/views/abstract_controller/testing/me3/index.erb @@ -0,0 +1 @@ +Hello from me3/index.erb \ No newline at end of file diff --git a/actionpack/test/abstract_controller/views/abstract_controller/testing/me4/index.erb b/actionpack/test/abstract_controller/views/abstract_controller/testing/me4/index.erb new file mode 100644 index 0000000000..89dce12bdc --- /dev/null +++ b/actionpack/test/abstract_controller/views/abstract_controller/testing/me4/index.erb @@ -0,0 +1 @@ +Hello from me4/index.erb \ No newline at end of file diff --git a/actionpack/test/abstract_controller/views/abstract_controller/testing/me5/index.erb b/actionpack/test/abstract_controller/views/abstract_controller/testing/me5/index.erb new file mode 100644 index 0000000000..84d0b7417e --- /dev/null +++ b/actionpack/test/abstract_controller/views/abstract_controller/testing/me5/index.erb @@ -0,0 +1 @@ +Hello from me5/index.erb \ No newline at end of file diff --git a/actionpack/test/abstract_controller/views/action_with_ivars.erb b/actionpack/test/abstract_controller/views/action_with_ivars.erb new file mode 100644 index 0000000000..8d8ae22fd7 --- /dev/null +++ b/actionpack/test/abstract_controller/views/action_with_ivars.erb @@ -0,0 +1 @@ +<%= @my_ivar %> from index_with_ivars.erb \ No newline at end of file diff --git a/actionpack/test/abstract_controller/views/layouts/abstract_controller/testing/me4.erb b/actionpack/test/abstract_controller/views/layouts/abstract_controller/testing/me4.erb new file mode 100644 index 0000000000..172dd56569 --- /dev/null +++ b/actionpack/test/abstract_controller/views/layouts/abstract_controller/testing/me4.erb @@ -0,0 +1 @@ +Me4 Enter : <%= yield %> : Exit \ No newline at end of file diff --git a/actionpack/test/abstract_controller/views/layouts/application.erb b/actionpack/test/abstract_controller/views/layouts/application.erb new file mode 100644 index 0000000000..27317140ad --- /dev/null +++ b/actionpack/test/abstract_controller/views/layouts/application.erb @@ -0,0 +1 @@ +Application Enter : <%= yield %> : Exit \ No newline at end of file diff --git a/actionpack/test/abstract_controller/views/naked_render.erb b/actionpack/test/abstract_controller/views/naked_render.erb new file mode 100644 index 0000000000..1b3d03878b --- /dev/null +++ b/actionpack/test/abstract_controller/views/naked_render.erb @@ -0,0 +1 @@ +Hello from naked_render.erb \ No newline at end of file -- cgit v1.2.3