Move render_test to AV

acc8e259 · Łukasz Strzałkowski · aa2d0038 · acc8e259 · acc8e259 · acc8e259
93 changed file
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
--- a/actionview/test/actionpack/render_test.rb
+++ b/actionview/test/actionpack/render_test.rb
--- a/actionview/test/fixtures/actionpack/bad_customers/_bad_customer.html.erb
+++ b/actionview/test/fixtures/actionpack/bad_customers/_bad_customer.html.erb
+<%= greeting %> bad customer: <%= bad_customer.name %><%= bad_customer_counter %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/customers/_customer.html.erb
+++ b/actionview/test/fixtures/actionpack/customers/_customer.html.erb
+<%= greeting %>: <%= customer.name %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/fun/games/_form.erb
+++ b/actionview/test/fixtures/actionpack/fun/games/_form.erb
+<%= form.label :title %>
--- a/actionview/test/fixtures/actionpack/fun/games/hello_world.erb
+++ b/actionview/test/fixtures/actionpack/fun/games/hello_world.erb
+Living in a nested world
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/good_customers/_good_customer.html.erb
+++ b/actionview/test/fixtures/actionpack/good_customers/_good_customer.html.erb
+<%= greeting %> good customer: <%= good_customer.name %><%= good_customer_counter %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/hello.html
+++ b/actionview/test/fixtures/actionpack/hello.html
+Hello world!
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/layouts/_customers.erb
+++ b/actionview/test/fixtures/actionpack/layouts/_customers.erb
+<title><%= yield Struct.new(:name).new("David") %></title>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/layouts/block_with_layout.erb
+++ b/actionview/test/fixtures/actionpack/layouts/block_with_layout.erb
+<%= render(:layout => "layout_for_partial", :locals => { :name => "Anthony" }) do %>Inside from first block in layout<% "Return value should be discarded" %><% end %>
+<%= yield %>
+<%= render(:layout => "layout_for_partial", :locals => { :name => "Ramm" }) do %>Inside from second block in layout<% end %>
--- a/actionview/test/fixtures/actionpack/layouts/builder.builder
+++ b/actionview/test/fixtures/actionpack/layouts/builder.builder
+xml.wrapper do
+  xml << yield
+end
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/layouts/partial_with_layout.erb
+++ b/actionview/test/fixtures/actionpack/layouts/partial_with_layout.erb
+<%= render( :layout => "layout_for_partial", :partial => "partial_for_use_in_layout", :locals => {:name => 'Anthony' } ) %>
+<%= yield %>
+<%= render( :layout => "layout_for_partial", :partial => "partial_for_use_in_layout", :locals => {:name => 'Ramm' } ) %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/layouts/standard.html.erb
+++ b/actionview/test/fixtures/actionpack/layouts/standard.html.erb
+<html><%= yield %><%= @variable_for_layout %></html>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/layouts/talk_from_action.erb
+++ b/actionview/test/fixtures/actionpack/layouts/talk_from_action.erb
+<title><%= @title || yield(:title) %></title>
+<%= yield -%>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/layouts/with_html_partial.html.erb
+++ b/actionview/test/fixtures/actionpack/layouts/with_html_partial.html.erb
+<%= render :partial => "partial_only_html" %><%= yield %>
--- a/actionview/test/fixtures/actionpack/layouts/xhr.html.erb
+++ b/actionview/test/fixtures/actionpack/layouts/xhr.html.erb
+XHR!
+<%= yield %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/layouts/yield.erb
+++ b/actionview/test/fixtures/actionpack/layouts/yield.erb
+<title><%= yield :title %></title>
+<%= yield %>
--- a/actionview/test/fixtures/actionpack/quiz/questions/_question.html.erb
+++ b/actionview/test/fixtures/actionpack/quiz/questions/_question.html.erb
+<%= question.name %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/shared.html.erb
+++ b/actionview/test/fixtures/actionpack/shared.html.erb
+Elastica
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_changing_priority.html.erb
+++ b/actionview/test/fixtures/actionpack/test/_changing_priority.html.erb
+HTML
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_changing_priority.json.erb
+++ b/actionview/test/fixtures/actionpack/test/_changing_priority.json.erb
+JSON
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_counter.html.erb
+++ b/actionview/test/fixtures/actionpack/test/_counter.html.erb
+<%= counter_counter %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_customer.erb
+++ b/actionview/test/fixtures/actionpack/test/_customer.erb
+Hello: <%= customer.name rescue "Anonymous" %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_customer_counter.erb
+++ b/actionview/test/fixtures/actionpack/test/_customer_counter.erb
+<%= customer_counter.name %><%= customer_counter_counter %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_customer_counter_with_as.erb
+++ b/actionview/test/fixtures/actionpack/test/_customer_counter_with_as.erb
+<%= client.name %><%= client_counter %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_customer_greeting.erb
+++ b/actionview/test/fixtures/actionpack/test/_customer_greeting.erb
+<%= greeting %>: <%= customer_greeting.name %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_customer_with_var.erb
+++ b/actionview/test/fixtures/actionpack/test/_customer_with_var.erb
+<%= customer.name %> <%= customer.name %> <%= customer.name %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_directory/_partial_with_locales.html.erb
+++ b/actionview/test/fixtures/actionpack/test/_directory/_partial_with_locales.html.erb
+Hello <%= name %>
--- a/actionview/test/fixtures/actionpack/test/_first_json_partial.json.erb
+++ b/actionview/test/fixtures/actionpack/test/_first_json_partial.json.erb
+<%= render :partial => "test/second_json_partial" %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_form.erb
+++ b/actionview/test/fixtures/actionpack/test/_form.erb
+<%= form.label :title %>
--- a/actionview/test/fixtures/actionpack/test/_hash_greeting.erb
+++ b/actionview/test/fixtures/actionpack/test/_hash_greeting.erb
+<%= greeting %>: <%= hash_greeting[:first_name] %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_hash_object.erb
+++ b/actionview/test/fixtures/actionpack/test/_hash_object.erb
+<%= hash_object[:first_name] %>
+<%= hash_object[:first_name].reverse %>
--- a/actionview/test/fixtures/actionpack/test/_hello.builder
+++ b/actionview/test/fixtures/actionpack/test/_hello.builder
+xm.hello
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_json_change_priority.json.erb
+++ b/actionview/test/fixtures/actionpack/test/_json_change_priority.json.erb
--- a/actionview/test/fixtures/actionpack/test/_labelling_form.erb
+++ b/actionview/test/fixtures/actionpack/test/_labelling_form.erb
+<%= labelling_form.label :title %>
--- a/actionview/test/fixtures/actionpack/test/_layout_for_partial.html.erb
+++ b/actionview/test/fixtures/actionpack/test/_layout_for_partial.html.erb
+Before (<%= name %>)
+<%= yield %>
+After
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_partial.erb
+++ b/actionview/test/fixtures/actionpack/test/_partial.erb
+invalid
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_partial.html.erb
+++ b/actionview/test/fixtures/actionpack/test/_partial.html.erb
+partial html
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_partial.js.erb
+++ b/actionview/test/fixtures/actionpack/test/_partial.js.erb
+partial js
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_partial_for_use_in_layout.html.erb
+++ b/actionview/test/fixtures/actionpack/test/_partial_for_use_in_layout.html.erb
+Inside from partial (<%= name %>)
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_partial_html_erb.html.erb
+++ b/actionview/test/fixtures/actionpack/test/_partial_html_erb.html.erb
+<%= "partial.html.erb" %>
--- a/actionview/test/fixtures/actionpack/test/_partial_name_local_variable.erb
+++ b/actionview/test/fixtures/actionpack/test/_partial_name_local_variable.erb
+<%= partial_name_local_variable %>
--- a/actionview/test/fixtures/actionpack/test/_partial_only.erb
+++ b/actionview/test/fixtures/actionpack/test/_partial_only.erb
+only partial
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_partial_only_html.html
+++ b/actionview/test/fixtures/actionpack/test/_partial_only_html.html
+only html partial
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_partial_with_partial.erb
+++ b/actionview/test/fixtures/actionpack/test/_partial_with_partial.erb
+<%= render 'test/partial' %>
+partial with partial
--- a/actionview/test/fixtures/actionpack/test/_person.erb
+++ b/actionview/test/fixtures/actionpack/test/_person.erb
+Second: <%= name %>
+Third: <%= @name %>
--- a/actionview/test/fixtures/actionpack/test/_raise_indentation.html.erb
+++ b/actionview/test/fixtures/actionpack/test/_raise_indentation.html.erb
+<p>First paragraph</p>
+<p>Second paragraph</p>
+<p>Third paragraph</p>
+<p>Fourth paragraph</p>
+<p>Fifth paragraph</p>
+<p>Sixth paragraph</p>
+<p>Seventh paragraph</p>
+<p>Eight paragraph</p>
+<p>Ninth paragraph</p>
+<p>Tenth paragraph</p>
+<%= raise "error here!" %>
+<p>Eleventh paragraph</p>
+<p>Twelfth paragraph</p>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/_second_json_partial.json.erb
+++ b/actionview/test/fixtures/actionpack/test/_second_json_partial.json.erb
+Third level
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/action_talk_to_layout.erb
+++ b/actionview/test/fixtures/actionpack/test/action_talk_to_layout.erb
+<% @title = "Talking to the layout" -%>
+Action was here!
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/calling_partial_with_layout.html.erb
+++ b/actionview/test/fixtures/actionpack/test/calling_partial_with_layout.html.erb
+<%= render(:layout => "layout_for_partial", :partial => "partial_for_use_in_layout", :locals => { :name => "David" }) %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/capturing.erb
+++ b/actionview/test/fixtures/actionpack/test/capturing.erb
+<% days = capture do %>
+  Dreamy days
+<% end %>
+<%= days %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/change_priority.html.erb
+++ b/actionview/test/fixtures/actionpack/test/change_priority.html.erb
+<%= render :partial => "test/json_change_priority", formats: :json %>
+HTML Template, but <%= render :partial => "test/changing_priority" %> partial
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/content_for.erb
+++ b/actionview/test/fixtures/actionpack/test/content_for.erb
+<% content_for :title do -%>Putting stuff in the title!<% end -%>Great stuff!
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/content_for_concatenated.erb
+++ b/actionview/test/fixtures/actionpack/test/content_for_concatenated.erb
+<% content_for :title, "Putting stuff "
+   content_for :title, "in the title!" -%>
+Great stuff!
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/content_for_with_parameter.erb
+++ b/actionview/test/fixtures/actionpack/test/content_for_with_parameter.erb
+<% content_for :title, "Putting stuff in the title!" -%>
+Great stuff!
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/dot.directory/render_file_with_ivar.erb
+++ b/actionview/test/fixtures/actionpack/test/dot.directory/render_file_with_ivar.erb
+The secret is <%= @secret %>
--- a/actionview/test/fixtures/actionpack/test/formatted_html_erb.html.erb
+++ b/actionview/test/fixtures/actionpack/test/formatted_html_erb.html.erb
+formatted html erb
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder
+++ b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder
+xml.test 'failed'
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/formatted_xml_erb.html.erb
+++ b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.html.erb
+<test>passed formatted html erb</test>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/formatted_xml_erb.xml.erb
+++ b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.xml.erb
+<test>passed formatted xml erb</test>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/greeting.html.erb
+++ b/actionview/test/fixtures/actionpack/test/greeting.html.erb
+<p>This is grand!</p>
--- a/actionview/test/fixtures/actionpack/test/greeting.xml.erb
+++ b/actionview/test/fixtures/actionpack/test/greeting.xml.erb
+<p>This is grand!</p>
--- a/actionview/test/fixtures/actionpack/test/hello,world.erb
+++ b/actionview/test/fixtures/actionpack/test/hello,world.erb
+Hello w*rld!
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/hello.builder
+++ b/actionview/test/fixtures/actionpack/test/hello.builder
+xml.html do
+  xml.p "Hello #{@name}"
+  xml << render(:file => "test/greeting")
+end
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/hello/hello.erb
+++ b/actionview/test/fixtures/actionpack/test/hello/hello.erb
+Hello world!
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/hello_world.erb
+++ b/actionview/test/fixtures/actionpack/test/hello_world.erb
+Hello world!
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/hello_world_container.builder
+++ b/actionview/test/fixtures/actionpack/test/hello_world_container.builder
+xml.test do
+  render :partial => 'hello', :locals => { :xm => xml }
+end
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder
+++ b/actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder
+xml.html do
+  xml.p "Hello"
+end
--- a/actionview/test/fixtures/actionpack/test/hello_world_with_layout_false.erb
+++ b/actionview/test/fixtures/actionpack/test/hello_world_with_layout_false.erb
+Hello world!
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/hello_world_with_partial.html.erb
+++ b/actionview/test/fixtures/actionpack/test/hello_world_with_partial.html.erb
+Hello world!
+<%= render '/test/partial' %>
--- a/actionview/test/fixtures/actionpack/test/hello_xml_world.builder
+++ b/actionview/test/fixtures/actionpack/test/hello_xml_world.builder
+xml.html do
+  xml.head do
+    xml.title "Hello World"
+  end
+
+  xml.body do
+    xml.p "abes"
+    xml.p "monks"
+    xml.p "wiseguys"
+  end
+end
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/html_template.html.erb
+++ b/actionview/test/fixtures/actionpack/test/html_template.html.erb
+<%= render :partial => "test/first_json_partial", formats: :json %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/hyphen-ated.erb
+++ b/actionview/test/fixtures/actionpack/test/hyphen-ated.erb
+Hello world!
--- a/actionview/test/fixtures/actionpack/test/implicit_content_type.atom.builder
+++ b/actionview/test/fixtures/actionpack/test/implicit_content_type.atom.builder
+xml.atom do
+end
--- a/actionview/test/fixtures/actionpack/test/list.erb
+++ b/actionview/test/fixtures/actionpack/test/list.erb
+<%= @test_unchanged = 'goodbye' %><%= render :partial => 'customer', :collection => @customers %><%= @test_unchanged %>
--- a/actionview/test/fixtures/actionpack/test/non_erb_block_content_for.builder
+++ b/actionview/test/fixtures/actionpack/test/non_erb_block_content_for.builder
+content_for :title do
+  'Putting stuff in the title!'
+end
+xml << "Great stuff!"
--- a/actionview/test/fixtures/actionpack/test/potential_conflicts.erb
+++ b/actionview/test/fixtures/actionpack/test/potential_conflicts.erb
+First: <%= @name %>
+<%= render :partial => "person", :locals => { :name => "Stephan" } -%>
+Fourth: <%= @name %>
+Fifth: <%= name %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/proper_block_detection.erb
+++ b/actionview/test/fixtures/actionpack/test/proper_block_detection.erb
+<%= @todo %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/render_file_from_template.html.erb
+++ b/actionview/test/fixtures/actionpack/test/render_file_from_template.html.erb
+<%= render :file => @path %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/render_file_with_ivar.erb
+++ b/actionview/test/fixtures/actionpack/test/render_file_with_ivar.erb
+The secret is <%= @secret %>
--- a/actionview/test/fixtures/actionpack/test/render_file_with_locals.erb
+++ b/actionview/test/fixtures/actionpack/test/render_file_with_locals.erb
+The secret is <%= secret %>
--- a/actionview/test/fixtures/actionpack/test/render_file_with_locals_and_default.erb
+++ b/actionview/test/fixtures/actionpack/test/render_file_with_locals_and_default.erb
+<%= secret ||= 'one' %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/render_implicit_html_template_from_xhr_request.da.html.erb
+++ b/actionview/test/fixtures/actionpack/test/render_implicit_html_template_from_xhr_request.da.html.erb
+Hey HTML!
--- a/actionview/test/fixtures/actionpack/test/render_implicit_html_template_from_xhr_request.html.erb
+++ b/actionview/test/fixtures/actionpack/test/render_implicit_html_template_from_xhr_request.html.erb
+Hello HTML!
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/render_implicit_js_template_without_layout.js.erb
+++ b/actionview/test/fixtures/actionpack/test/render_implicit_js_template_without_layout.js.erb
+alert('hello');
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/render_partial_inside_directory.html.erb
+++ b/actionview/test/fixtures/actionpack/test/render_partial_inside_directory.html.erb
+<%= render partial: 'test/_directory/partial_with_locales', locals: {'name' => 'Jane'} %>
--- a/actionview/test/fixtures/actionpack/test/render_to_string_test.erb
+++ b/actionview/test/fixtures/actionpack/test/render_to_string_test.erb
+The value of foo is: ::<%= @foo %>::
--- a/actionview/test/fixtures/actionpack/test/render_two_partials.html.erb
+++ b/actionview/test/fixtures/actionpack/test/render_two_partials.html.erb
+<%= render :partial => 'partial', :locals => {'first' => '1'} %>
+<%= render :partial => 'partial', :locals => {'second' => '2'} %>
--- a/actionview/test/fixtures/actionpack/test/using_layout_around_block.html.erb
+++ b/actionview/test/fixtures/actionpack/test/using_layout_around_block.html.erb
+<%= render(:layout => "layout_for_partial", :locals => { :name => "David" }) do %>Inside from block<% end %>
\ No newline at end of file
--- a/actionview/test/fixtures/actionpack/test/with_html_partial.html.erb
+++ b/actionview/test/fixtures/actionpack/test/with_html_partial.html.erb
+<strong><%= render :partial => "partial_only_html" %></strong>
--- a/actionview/test/fixtures/actionpack/test/with_partial.html.erb
+++ b/actionview/test/fixtures/actionpack/test/with_partial.html.erb
+<strong><%= render :partial => "partial_only" %></strong>
--- a/actionview/test/fixtures/actionpack/test/with_partial.text.erb
+++ b/actionview/test/fixtures/actionpack/test/with_partial.text.erb
+**<%= render :partial => "partial_only" %>**
--- a/actionview/test/fixtures/actionpack/test/with_xml_template.html.erb
+++ b/actionview/test/fixtures/actionpack/test/with_xml_template.html.erb
+<%= render :template => "test/greeting", :formats => :xml %>