Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move remaining layouts tests to AV

  • Loading branch information...
commit c9ef9c1442f0b33a0641466398801aa69ce141f1 1 parent 53e65e1
@strzalek strzalek authored
Showing with 22 additions and 4 deletions.
  1. +0 −1  actionpack/test/fixtures/layout_tests/layouts/symlinked
  2. +3 −3 {actionpack/test/controller → actionview/test/actionpack}/layout_test.rb
  3. 0  {actionpack/test/fixtures → actionview/test/fixtures/actionpack}/layout_tests/alt/layouts/alt.erb
  4. 0  .../fixtures → actionview/test/fixtures/actionpack}/layout_tests/layouts/controller_name_space/nested.erb
  5. 0  {actionpack/test/fixtures → actionview/test/fixtures/actionpack}/layout_tests/layouts/item.erb
  6. 0  {actionpack/test/fixtures → actionview/test/fixtures/actionpack}/layout_tests/layouts/layout_test.erb
  7. 0  ...test/fixtures → actionview/test/fixtures/actionpack}/layout_tests/layouts/multiple_extensions.html.erb
  8. +5 −0 actionview/test/fixtures/actionpack/layout_tests/layouts/symlinked/symlinked_layout.erb
  9. 0  .../fixtures → actionview/test/fixtures/actionpack}/layout_tests/layouts/third_party_template_library.mab
  10. 0  {actionpack/test/fixtures → actionview/test/fixtures/actionpack}/layout_tests/views/goodbye.erb
  11. 0  {actionpack/test/fixtures → actionview/test/fixtures/actionpack}/layout_tests/views/hello.erb
  12. +2 −0  actionview/test/fixtures/actionpack/layouts/_column.html.erb
  13. +2 −0  actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb
  14. +1 −0  actionview/test/fixtures/actionpack/layouts/_yield_only.erb
  15. +1 −0  actionview/test/fixtures/actionpack/layouts/_yield_with_params.erb
  16. +4 −0 actionview/test/fixtures/actionpack/layouts/streaming.erb
  17. +2 −0  actionview/test/fixtures/actionpack/layouts/yield_with_render_inline_inside.erb
  18. +2 −0  actionview/test/fixtures/actionpack/layouts/yield_with_render_partial_inside.erb
View
1  actionpack/test/fixtures/layout_tests/layouts/symlinked
View
6 actionpack/test/controller/layout_test.rb → actionview/test/actionpack/layout_test.rb
@@ -9,7 +9,7 @@
ActionView::Template::register_template_handler :mab,
lambda { |template| template.source.inspect }
-ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/layout_tests/' ]
+ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/actionpack/layout_tests/' ]
class LayoutTest < ActionController::Base
def self.controller_path; 'views' end
@@ -87,7 +87,7 @@ def render(*args)
end
class AbsolutePathLayoutController < LayoutTest
- layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/layout_tests/layouts/layout_test')
+ layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/actionpack/layout_tests/layouts/layout_test')
end
class HasOwnLayoutController < LayoutTest
@@ -108,7 +108,7 @@ class HasNilLayoutProc < LayoutTest
class PrependsViewPathController < LayoutTest
def hello
- prepend_view_path File.dirname(__FILE__) + '/../fixtures/layout_tests/alt/'
+ prepend_view_path File.dirname(__FILE__) + '/../fixtures/actionpack/layout_tests/alt/'
render :layout => 'alt'
end
end
View
0  ...fixtures/layout_tests/alt/layouts/alt.erb → ...tionpack/layout_tests/alt/layouts/alt.erb
File renamed without changes
View
0  .../layouts/controller_name_space/nested.erb → .../layouts/controller_name_space/nested.erb
File renamed without changes
View
0  ...st/fixtures/layout_tests/layouts/item.erb → .../actionpack/layout_tests/layouts/item.erb
File renamed without changes
View
0  ...ures/layout_tests/layouts/layout_test.erb → ...pack/layout_tests/layouts/layout_test.erb
File renamed without changes
View
0  ...ests/layouts/multiple_extensions.html.erb → ...ests/layouts/multiple_extensions.html.erb
File renamed without changes
View
5 actionview/test/fixtures/actionpack/layout_tests/layouts/symlinked/symlinked_layout.erb
@@ -0,0 +1,5 @@
+This is my layout
+
+<%= yield %>
+
+End.
View
0  .../layouts/third_party_template_library.mab → .../layouts/third_party_template_library.mab
File renamed without changes
View
0  ...t/fixtures/layout_tests/views/goodbye.erb → ...actionpack/layout_tests/views/goodbye.erb
File renamed without changes
View
0  ...est/fixtures/layout_tests/views/hello.erb → ...s/actionpack/layout_tests/views/hello.erb
File renamed without changes
View
2  actionview/test/fixtures/actionpack/layouts/_column.html.erb
@@ -0,0 +1,2 @@
+<div id="column"><%= yield :column %></div>
+<div id="content"><%= yield %></div>
View
2  actionview/test/fixtures/actionpack/layouts/_partial_and_yield.erb
@@ -0,0 +1,2 @@
+<%= render :partial => 'test/partial' %>
+<%= yield %>
View
1  actionview/test/fixtures/actionpack/layouts/_yield_only.erb
@@ -0,0 +1 @@
+<%= yield %>
View
1  actionview/test/fixtures/actionpack/layouts/_yield_with_params.erb
@@ -0,0 +1 @@
+<%= yield 'Yield!' %>
View
4 actionview/test/fixtures/actionpack/layouts/streaming.erb
@@ -0,0 +1,4 @@
+<%= yield :header -%>
+<%= yield -%>
+<%= yield :footer -%>
+<%= yield(:unknown).presence || "." -%>
View
2  actionview/test/fixtures/actionpack/layouts/yield_with_render_inline_inside.erb
@@ -0,0 +1,2 @@
+<%= render :inline => 'welcome' %>
+<%= yield %>
View
2  actionview/test/fixtures/actionpack/layouts/yield_with_render_partial_inside.erb
@@ -0,0 +1,2 @@
+<%= render :partial => 'test/partial' %>
+<%= yield %>
Please sign in to comment.
Something went wrong with that request. Please try again.