From 1b446d06dddd2e14b4725eb896d046d4218941c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?= Date: Tue, 25 Jun 2013 14:58:29 +0200 Subject: Move view_paths from AP to AV --- actionview/test/fixtures/override/test/hello_world.erb | 1 + actionview/test/fixtures/override2/layouts/test/sub.erb | 1 + 2 files changed, 2 insertions(+) create mode 100644 actionview/test/fixtures/override/test/hello_world.erb create mode 100644 actionview/test/fixtures/override2/layouts/test/sub.erb (limited to 'actionview/test/fixtures') diff --git a/actionview/test/fixtures/override/test/hello_world.erb b/actionview/test/fixtures/override/test/hello_world.erb new file mode 100644 index 0000000000..3e308d3d86 --- /dev/null +++ b/actionview/test/fixtures/override/test/hello_world.erb @@ -0,0 +1 @@ +Hello overridden world! \ No newline at end of file diff --git a/actionview/test/fixtures/override2/layouts/test/sub.erb b/actionview/test/fixtures/override2/layouts/test/sub.erb new file mode 100644 index 0000000000..3863d5a8ef --- /dev/null +++ b/actionview/test/fixtures/override2/layouts/test/sub.erb @@ -0,0 +1 @@ +layout: <%= yield %> \ No newline at end of file -- cgit v1.2.3 From acc8e25902902a7123fb34aaf143f73a8ef729dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?= Date: Mon, 5 Aug 2013 23:58:20 +0200 Subject: Move render_test to AV --- .../actionpack/bad_customers/_bad_customer.html.erb | 1 + .../test/fixtures/actionpack/customers/_customer.html.erb | 1 + actionview/test/fixtures/actionpack/fun/games/_form.erb | 1 + .../test/fixtures/actionpack/fun/games/hello_world.erb | 1 + .../actionpack/good_customers/_good_customer.html.erb | 1 + actionview/test/fixtures/actionpack/hello.html | 1 + actionview/test/fixtures/actionpack/layouts/_customers.erb | 1 + .../test/fixtures/actionpack/layouts/block_with_layout.erb | 3 +++ actionview/test/fixtures/actionpack/layouts/builder.builder | 3 +++ .../fixtures/actionpack/layouts/partial_with_layout.erb | 3 +++ .../test/fixtures/actionpack/layouts/standard.html.erb | 1 + .../test/fixtures/actionpack/layouts/talk_from_action.erb | 2 ++ .../fixtures/actionpack/layouts/with_html_partial.html.erb | 1 + actionview/test/fixtures/actionpack/layouts/xhr.html.erb | 2 ++ actionview/test/fixtures/actionpack/layouts/yield.erb | 2 ++ .../fixtures/actionpack/quiz/questions/_question.html.erb | 1 + actionview/test/fixtures/actionpack/shared.html.erb | 1 + .../fixtures/actionpack/test/_changing_priority.html.erb | 1 + .../fixtures/actionpack/test/_changing_priority.json.erb | 1 + actionview/test/fixtures/actionpack/test/_counter.html.erb | 1 + actionview/test/fixtures/actionpack/test/_customer.erb | 1 + .../test/fixtures/actionpack/test/_customer_counter.erb | 1 + .../fixtures/actionpack/test/_customer_counter_with_as.erb | 1 + .../test/fixtures/actionpack/test/_customer_greeting.erb | 1 + .../test/fixtures/actionpack/test/_customer_with_var.erb | 1 + .../test/_directory/_partial_with_locales.html.erb | 1 + .../fixtures/actionpack/test/_first_json_partial.json.erb | 1 + actionview/test/fixtures/actionpack/test/_form.erb | 1 + actionview/test/fixtures/actionpack/test/_hash_greeting.erb | 1 + actionview/test/fixtures/actionpack/test/_hash_object.erb | 2 ++ actionview/test/fixtures/actionpack/test/_hello.builder | 1 + .../fixtures/actionpack/test/_json_change_priority.json.erb | 0 .../test/fixtures/actionpack/test/_labelling_form.erb | 1 + .../fixtures/actionpack/test/_layout_for_partial.html.erb | 3 +++ actionview/test/fixtures/actionpack/test/_partial.erb | 1 + actionview/test/fixtures/actionpack/test/_partial.html.erb | 1 + actionview/test/fixtures/actionpack/test/_partial.js.erb | 1 + .../actionpack/test/_partial_for_use_in_layout.html.erb | 1 + .../fixtures/actionpack/test/_partial_html_erb.html.erb | 1 + .../actionpack/test/_partial_name_local_variable.erb | 1 + actionview/test/fixtures/actionpack/test/_partial_only.erb | 1 + .../test/fixtures/actionpack/test/_partial_only_html.html | 1 + .../test/fixtures/actionpack/test/_partial_with_partial.erb | 2 ++ actionview/test/fixtures/actionpack/test/_person.erb | 2 ++ .../fixtures/actionpack/test/_raise_indentation.html.erb | 13 +++++++++++++ .../fixtures/actionpack/test/_second_json_partial.json.erb | 1 + .../test/fixtures/actionpack/test/action_talk_to_layout.erb | 2 ++ .../actionpack/test/calling_partial_with_layout.html.erb | 1 + actionview/test/fixtures/actionpack/test/capturing.erb | 4 ++++ .../test/fixtures/actionpack/test/change_priority.html.erb | 2 ++ actionview/test/fixtures/actionpack/test/content_for.erb | 1 + .../fixtures/actionpack/test/content_for_concatenated.erb | 3 +++ .../fixtures/actionpack/test/content_for_with_parameter.erb | 2 ++ .../actionpack/test/dot.directory/render_file_with_ivar.erb | 1 + .../fixtures/actionpack/test/formatted_html_erb.html.erb | 1 + .../test/fixtures/actionpack/test/formatted_xml_erb.builder | 1 + .../fixtures/actionpack/test/formatted_xml_erb.html.erb | 1 + .../test/fixtures/actionpack/test/formatted_xml_erb.xml.erb | 1 + actionview/test/fixtures/actionpack/test/greeting.html.erb | 1 + actionview/test/fixtures/actionpack/test/greeting.xml.erb | 1 + actionview/test/fixtures/actionpack/test/hello,world.erb | 1 + actionview/test/fixtures/actionpack/test/hello.builder | 4 ++++ actionview/test/fixtures/actionpack/test/hello/hello.erb | 1 + actionview/test/fixtures/actionpack/test/hello_world.erb | 1 + .../fixtures/actionpack/test/hello_world_container.builder | 3 +++ .../fixtures/actionpack/test/hello_world_from_rxml.builder | 3 +++ .../actionpack/test/hello_world_with_layout_false.erb | 1 + .../actionpack/test/hello_world_with_partial.html.erb | 2 ++ .../test/fixtures/actionpack/test/hello_xml_world.builder | 11 +++++++++++ .../test/fixtures/actionpack/test/html_template.html.erb | 1 + actionview/test/fixtures/actionpack/test/hyphen-ated.erb | 1 + .../actionpack/test/implicit_content_type.atom.builder | 2 ++ actionview/test/fixtures/actionpack/test/list.erb | 1 + .../actionpack/test/non_erb_block_content_for.builder | 4 ++++ .../test/fixtures/actionpack/test/potential_conflicts.erb | 4 ++++ .../fixtures/actionpack/test/proper_block_detection.erb | 1 + .../actionpack/test/render_file_from_template.html.erb | 1 + .../test/fixtures/actionpack/test/render_file_with_ivar.erb | 1 + .../fixtures/actionpack/test/render_file_with_locals.erb | 1 + .../actionpack/test/render_file_with_locals_and_default.erb | 1 + ...nder_implicit_html_template_from_xhr_request.da.html.erb | 1 + .../render_implicit_html_template_from_xhr_request.html.erb | 1 + .../test/render_implicit_js_template_without_layout.js.erb | 1 + .../test/render_partial_inside_directory.html.erb | 1 + .../test/fixtures/actionpack/test/render_to_string_test.erb | 1 + .../fixtures/actionpack/test/render_two_partials.html.erb | 2 ++ .../actionpack/test/using_layout_around_block.html.erb | 1 + .../fixtures/actionpack/test/with_html_partial.html.erb | 1 + .../test/fixtures/actionpack/test/with_partial.html.erb | 1 + .../test/fixtures/actionpack/test/with_partial.text.erb | 1 + .../fixtures/actionpack/test/with_xml_template.html.erb | 1 + 91 files changed, 150 insertions(+) create mode 100644 actionview/test/fixtures/actionpack/bad_customers/_bad_customer.html.erb create mode 100644 actionview/test/fixtures/actionpack/customers/_customer.html.erb create mode 100644 actionview/test/fixtures/actionpack/fun/games/_form.erb create mode 100644 actionview/test/fixtures/actionpack/fun/games/hello_world.erb create mode 100644 actionview/test/fixtures/actionpack/good_customers/_good_customer.html.erb create mode 100644 actionview/test/fixtures/actionpack/hello.html create mode 100644 actionview/test/fixtures/actionpack/layouts/_customers.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/block_with_layout.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/builder.builder create mode 100644 actionview/test/fixtures/actionpack/layouts/partial_with_layout.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/standard.html.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/talk_from_action.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/with_html_partial.html.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/xhr.html.erb create mode 100644 actionview/test/fixtures/actionpack/layouts/yield.erb create mode 100644 actionview/test/fixtures/actionpack/quiz/questions/_question.html.erb create mode 100644 actionview/test/fixtures/actionpack/shared.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/_changing_priority.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/_changing_priority.json.erb create mode 100644 actionview/test/fixtures/actionpack/test/_counter.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/_customer.erb create mode 100644 actionview/test/fixtures/actionpack/test/_customer_counter.erb create mode 100644 actionview/test/fixtures/actionpack/test/_customer_counter_with_as.erb create mode 100644 actionview/test/fixtures/actionpack/test/_customer_greeting.erb create mode 100644 actionview/test/fixtures/actionpack/test/_customer_with_var.erb create mode 100644 actionview/test/fixtures/actionpack/test/_directory/_partial_with_locales.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/_first_json_partial.json.erb create mode 100644 actionview/test/fixtures/actionpack/test/_form.erb create mode 100644 actionview/test/fixtures/actionpack/test/_hash_greeting.erb create mode 100644 actionview/test/fixtures/actionpack/test/_hash_object.erb create mode 100644 actionview/test/fixtures/actionpack/test/_hello.builder create mode 100644 actionview/test/fixtures/actionpack/test/_json_change_priority.json.erb create mode 100644 actionview/test/fixtures/actionpack/test/_labelling_form.erb create mode 100644 actionview/test/fixtures/actionpack/test/_layout_for_partial.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/_partial.erb create mode 100644 actionview/test/fixtures/actionpack/test/_partial.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/_partial.js.erb create mode 100644 actionview/test/fixtures/actionpack/test/_partial_for_use_in_layout.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/_partial_html_erb.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/_partial_name_local_variable.erb create mode 100644 actionview/test/fixtures/actionpack/test/_partial_only.erb create mode 100644 actionview/test/fixtures/actionpack/test/_partial_only_html.html create mode 100644 actionview/test/fixtures/actionpack/test/_partial_with_partial.erb create mode 100644 actionview/test/fixtures/actionpack/test/_person.erb create mode 100644 actionview/test/fixtures/actionpack/test/_raise_indentation.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/_second_json_partial.json.erb create mode 100644 actionview/test/fixtures/actionpack/test/action_talk_to_layout.erb create mode 100644 actionview/test/fixtures/actionpack/test/calling_partial_with_layout.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/capturing.erb create mode 100644 actionview/test/fixtures/actionpack/test/change_priority.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/content_for.erb create mode 100644 actionview/test/fixtures/actionpack/test/content_for_concatenated.erb create mode 100644 actionview/test/fixtures/actionpack/test/content_for_with_parameter.erb create mode 100644 actionview/test/fixtures/actionpack/test/dot.directory/render_file_with_ivar.erb create mode 100644 actionview/test/fixtures/actionpack/test/formatted_html_erb.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder create mode 100644 actionview/test/fixtures/actionpack/test/formatted_xml_erb.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/formatted_xml_erb.xml.erb create mode 100644 actionview/test/fixtures/actionpack/test/greeting.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/greeting.xml.erb create mode 100644 actionview/test/fixtures/actionpack/test/hello,world.erb create mode 100644 actionview/test/fixtures/actionpack/test/hello.builder create mode 100644 actionview/test/fixtures/actionpack/test/hello/hello.erb create mode 100644 actionview/test/fixtures/actionpack/test/hello_world.erb create mode 100644 actionview/test/fixtures/actionpack/test/hello_world_container.builder create mode 100644 actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder create mode 100644 actionview/test/fixtures/actionpack/test/hello_world_with_layout_false.erb create mode 100644 actionview/test/fixtures/actionpack/test/hello_world_with_partial.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/hello_xml_world.builder create mode 100644 actionview/test/fixtures/actionpack/test/html_template.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/hyphen-ated.erb create mode 100644 actionview/test/fixtures/actionpack/test/implicit_content_type.atom.builder create mode 100644 actionview/test/fixtures/actionpack/test/list.erb create mode 100644 actionview/test/fixtures/actionpack/test/non_erb_block_content_for.builder create mode 100644 actionview/test/fixtures/actionpack/test/potential_conflicts.erb create mode 100644 actionview/test/fixtures/actionpack/test/proper_block_detection.erb create mode 100644 actionview/test/fixtures/actionpack/test/render_file_from_template.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/render_file_with_ivar.erb create mode 100644 actionview/test/fixtures/actionpack/test/render_file_with_locals.erb create mode 100644 actionview/test/fixtures/actionpack/test/render_file_with_locals_and_default.erb create mode 100644 actionview/test/fixtures/actionpack/test/render_implicit_html_template_from_xhr_request.da.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/render_implicit_html_template_from_xhr_request.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/render_implicit_js_template_without_layout.js.erb create mode 100644 actionview/test/fixtures/actionpack/test/render_partial_inside_directory.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/render_to_string_test.erb create mode 100644 actionview/test/fixtures/actionpack/test/render_two_partials.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/using_layout_around_block.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/with_html_partial.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/with_partial.html.erb create mode 100644 actionview/test/fixtures/actionpack/test/with_partial.text.erb create mode 100644 actionview/test/fixtures/actionpack/test/with_xml_template.html.erb (limited to 'actionview/test/fixtures') diff --git a/actionview/test/fixtures/actionpack/bad_customers/_bad_customer.html.erb b/actionview/test/fixtures/actionpack/bad_customers/_bad_customer.html.erb new file mode 100644 index 0000000000..d22af431ec --- /dev/null +++ b/actionview/test/fixtures/actionpack/bad_customers/_bad_customer.html.erb @@ -0,0 +1 @@ +<%= greeting %> bad customer: <%= bad_customer.name %><%= bad_customer_counter %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/customers/_customer.html.erb b/actionview/test/fixtures/actionpack/customers/_customer.html.erb new file mode 100644 index 0000000000..483571e22a --- /dev/null +++ b/actionview/test/fixtures/actionpack/customers/_customer.html.erb @@ -0,0 +1 @@ +<%= greeting %>: <%= customer.name %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/fun/games/_form.erb b/actionview/test/fixtures/actionpack/fun/games/_form.erb new file mode 100644 index 0000000000..01107f1cb2 --- /dev/null +++ b/actionview/test/fixtures/actionpack/fun/games/_form.erb @@ -0,0 +1 @@ +<%= form.label :title %> diff --git a/actionview/test/fixtures/actionpack/fun/games/hello_world.erb b/actionview/test/fixtures/actionpack/fun/games/hello_world.erb new file mode 100644 index 0000000000..1ebfbe2539 --- /dev/null +++ b/actionview/test/fixtures/actionpack/fun/games/hello_world.erb @@ -0,0 +1 @@ +Living in a nested world \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/good_customers/_good_customer.html.erb b/actionview/test/fixtures/actionpack/good_customers/_good_customer.html.erb new file mode 100644 index 0000000000..a2d97ebc6d --- /dev/null +++ b/actionview/test/fixtures/actionpack/good_customers/_good_customer.html.erb @@ -0,0 +1 @@ +<%= greeting %> good customer: <%= good_customer.name %><%= good_customer_counter %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/hello.html b/actionview/test/fixtures/actionpack/hello.html new file mode 100644 index 0000000000..6769dd60bd --- /dev/null +++ b/actionview/test/fixtures/actionpack/hello.html @@ -0,0 +1 @@ +Hello world! \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layouts/_customers.erb b/actionview/test/fixtures/actionpack/layouts/_customers.erb new file mode 100644 index 0000000000..ae63f13cd3 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/_customers.erb @@ -0,0 +1 @@ +<%= yield Struct.new(:name).new("David") %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layouts/block_with_layout.erb b/actionview/test/fixtures/actionpack/layouts/block_with_layout.erb new file mode 100644 index 0000000000..73ac833e52 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/block_with_layout.erb @@ -0,0 +1,3 @@ +<%= 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 %> diff --git a/actionview/test/fixtures/actionpack/layouts/builder.builder b/actionview/test/fixtures/actionpack/layouts/builder.builder new file mode 100644 index 0000000000..7c7d4b2dd1 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/builder.builder @@ -0,0 +1,3 @@ +xml.wrapper do + xml << yield +end \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layouts/partial_with_layout.erb b/actionview/test/fixtures/actionpack/layouts/partial_with_layout.erb new file mode 100644 index 0000000000..a0349d731e --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/partial_with_layout.erb @@ -0,0 +1,3 @@ +<%= 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 diff --git a/actionview/test/fixtures/actionpack/layouts/standard.html.erb b/actionview/test/fixtures/actionpack/layouts/standard.html.erb new file mode 100644 index 0000000000..5e6c24fe39 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/standard.html.erb @@ -0,0 +1 @@ +<%= yield %><%= @variable_for_layout %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layouts/talk_from_action.erb b/actionview/test/fixtures/actionpack/layouts/talk_from_action.erb new file mode 100644 index 0000000000..bf53fdb785 --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/talk_from_action.erb @@ -0,0 +1,2 @@ +<%= @title || yield(:title) %> +<%= yield -%> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layouts/with_html_partial.html.erb b/actionview/test/fixtures/actionpack/layouts/with_html_partial.html.erb new file mode 100644 index 0000000000..fd2896aeaa --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/with_html_partial.html.erb @@ -0,0 +1 @@ +<%= render :partial => "partial_only_html" %><%= yield %> diff --git a/actionview/test/fixtures/actionpack/layouts/xhr.html.erb b/actionview/test/fixtures/actionpack/layouts/xhr.html.erb new file mode 100644 index 0000000000..85285324ec --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/xhr.html.erb @@ -0,0 +1,2 @@ +XHR! +<%= yield %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/layouts/yield.erb b/actionview/test/fixtures/actionpack/layouts/yield.erb new file mode 100644 index 0000000000..482dc9022e --- /dev/null +++ b/actionview/test/fixtures/actionpack/layouts/yield.erb @@ -0,0 +1,2 @@ +<%= yield :title %> +<%= yield %> diff --git a/actionview/test/fixtures/actionpack/quiz/questions/_question.html.erb b/actionview/test/fixtures/actionpack/quiz/questions/_question.html.erb new file mode 100644 index 0000000000..fb4dcfee64 --- /dev/null +++ b/actionview/test/fixtures/actionpack/quiz/questions/_question.html.erb @@ -0,0 +1 @@ +<%= question.name %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/shared.html.erb b/actionview/test/fixtures/actionpack/shared.html.erb new file mode 100644 index 0000000000..af262fc9f8 --- /dev/null +++ b/actionview/test/fixtures/actionpack/shared.html.erb @@ -0,0 +1 @@ +Elastica \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_changing_priority.html.erb b/actionview/test/fixtures/actionpack/test/_changing_priority.html.erb new file mode 100644 index 0000000000..3225efc49a --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_changing_priority.html.erb @@ -0,0 +1 @@ +HTML \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_changing_priority.json.erb b/actionview/test/fixtures/actionpack/test/_changing_priority.json.erb new file mode 100644 index 0000000000..7fa41dce66 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_changing_priority.json.erb @@ -0,0 +1 @@ +JSON \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_counter.html.erb b/actionview/test/fixtures/actionpack/test/_counter.html.erb new file mode 100644 index 0000000000..fd245bfc70 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_counter.html.erb @@ -0,0 +1 @@ +<%= counter_counter %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_customer.erb b/actionview/test/fixtures/actionpack/test/_customer.erb new file mode 100644 index 0000000000..d8220afeda --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_customer.erb @@ -0,0 +1 @@ +Hello: <%= customer.name rescue "Anonymous" %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_customer_counter.erb b/actionview/test/fixtures/actionpack/test/_customer_counter.erb new file mode 100644 index 0000000000..3435979dba --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_customer_counter.erb @@ -0,0 +1 @@ +<%= customer_counter.name %><%= customer_counter_counter %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_customer_counter_with_as.erb b/actionview/test/fixtures/actionpack/test/_customer_counter_with_as.erb new file mode 100644 index 0000000000..1241eb604d --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_customer_counter_with_as.erb @@ -0,0 +1 @@ +<%= client.name %><%= client_counter %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_customer_greeting.erb b/actionview/test/fixtures/actionpack/test/_customer_greeting.erb new file mode 100644 index 0000000000..6acbcb20c4 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_customer_greeting.erb @@ -0,0 +1 @@ +<%= greeting %>: <%= customer_greeting.name %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_customer_with_var.erb b/actionview/test/fixtures/actionpack/test/_customer_with_var.erb new file mode 100644 index 0000000000..00047dd20e --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_customer_with_var.erb @@ -0,0 +1 @@ +<%= customer.name %> <%= customer.name %> <%= customer.name %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_directory/_partial_with_locales.html.erb b/actionview/test/fixtures/actionpack/test/_directory/_partial_with_locales.html.erb new file mode 100644 index 0000000000..1cc8d41475 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_directory/_partial_with_locales.html.erb @@ -0,0 +1 @@ +Hello <%= name %> diff --git a/actionview/test/fixtures/actionpack/test/_first_json_partial.json.erb b/actionview/test/fixtures/actionpack/test/_first_json_partial.json.erb new file mode 100644 index 0000000000..790ee896db --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_first_json_partial.json.erb @@ -0,0 +1 @@ +<%= render :partial => "test/second_json_partial" %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_form.erb b/actionview/test/fixtures/actionpack/test/_form.erb new file mode 100644 index 0000000000..01107f1cb2 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_form.erb @@ -0,0 +1 @@ +<%= form.label :title %> diff --git a/actionview/test/fixtures/actionpack/test/_hash_greeting.erb b/actionview/test/fixtures/actionpack/test/_hash_greeting.erb new file mode 100644 index 0000000000..fc54a36f2a --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_hash_greeting.erb @@ -0,0 +1 @@ +<%= greeting %>: <%= hash_greeting[:first_name] %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_hash_object.erb b/actionview/test/fixtures/actionpack/test/_hash_object.erb new file mode 100644 index 0000000000..34a92c6a56 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_hash_object.erb @@ -0,0 +1,2 @@ +<%= hash_object[:first_name] %> +<%= hash_object[:first_name].reverse %> diff --git a/actionview/test/fixtures/actionpack/test/_hello.builder b/actionview/test/fixtures/actionpack/test/_hello.builder new file mode 100644 index 0000000000..ef52f632d1 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_hello.builder @@ -0,0 +1 @@ +xm.hello \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_json_change_priority.json.erb b/actionview/test/fixtures/actionpack/test/_json_change_priority.json.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/actionview/test/fixtures/actionpack/test/_labelling_form.erb b/actionview/test/fixtures/actionpack/test/_labelling_form.erb new file mode 100644 index 0000000000..1b95763165 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_labelling_form.erb @@ -0,0 +1 @@ +<%= labelling_form.label :title %> diff --git a/actionview/test/fixtures/actionpack/test/_layout_for_partial.html.erb b/actionview/test/fixtures/actionpack/test/_layout_for_partial.html.erb new file mode 100644 index 0000000000..666efadbb6 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_layout_for_partial.html.erb @@ -0,0 +1,3 @@ +Before (<%= name %>) +<%= yield %> +After \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_partial.erb b/actionview/test/fixtures/actionpack/test/_partial.erb new file mode 100644 index 0000000000..e466dcbd8e --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_partial.erb @@ -0,0 +1 @@ +invalid \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_partial.html.erb b/actionview/test/fixtures/actionpack/test/_partial.html.erb new file mode 100644 index 0000000000..e39f6c9827 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_partial.html.erb @@ -0,0 +1 @@ +partial html \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_partial.js.erb b/actionview/test/fixtures/actionpack/test/_partial.js.erb new file mode 100644 index 0000000000..b350cdd7ef --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_partial.js.erb @@ -0,0 +1 @@ +partial js \ No newline at end of file diff --git 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 new file mode 100644 index 0000000000..3a03a64e31 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_partial_for_use_in_layout.html.erb @@ -0,0 +1 @@ +Inside from partial (<%= name %>) \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_partial_html_erb.html.erb b/actionview/test/fixtures/actionpack/test/_partial_html_erb.html.erb new file mode 100644 index 0000000000..4b54875782 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_partial_html_erb.html.erb @@ -0,0 +1 @@ +<%= "partial.html.erb" %> diff --git a/actionview/test/fixtures/actionpack/test/_partial_name_local_variable.erb b/actionview/test/fixtures/actionpack/test/_partial_name_local_variable.erb new file mode 100644 index 0000000000..cc3a91c89f --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_partial_name_local_variable.erb @@ -0,0 +1 @@ +<%= partial_name_local_variable %> diff --git a/actionview/test/fixtures/actionpack/test/_partial_only.erb b/actionview/test/fixtures/actionpack/test/_partial_only.erb new file mode 100644 index 0000000000..a44b3eed40 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_partial_only.erb @@ -0,0 +1 @@ +only partial \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_partial_only_html.html b/actionview/test/fixtures/actionpack/test/_partial_only_html.html new file mode 100644 index 0000000000..d2d630bd40 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_partial_only_html.html @@ -0,0 +1 @@ +only html partial \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_partial_with_partial.erb b/actionview/test/fixtures/actionpack/test/_partial_with_partial.erb new file mode 100644 index 0000000000..ee0d5037b6 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_partial_with_partial.erb @@ -0,0 +1,2 @@ +<%= render 'test/partial' %> +partial with partial diff --git a/actionview/test/fixtures/actionpack/test/_person.erb b/actionview/test/fixtures/actionpack/test/_person.erb new file mode 100644 index 0000000000..b2e5688956 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_person.erb @@ -0,0 +1,2 @@ +Second: <%= name %> +Third: <%= @name %> diff --git a/actionview/test/fixtures/actionpack/test/_raise_indentation.html.erb b/actionview/test/fixtures/actionpack/test/_raise_indentation.html.erb new file mode 100644 index 0000000000..f9a93728fe --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_raise_indentation.html.erb @@ -0,0 +1,13 @@ +

First paragraph

+

Second paragraph

+

Third paragraph

+

Fourth paragraph

+

Fifth paragraph

+

Sixth paragraph

+

Seventh paragraph

+

Eight paragraph

+

Ninth paragraph

+

Tenth paragraph

+<%= raise "error here!" %> +

Eleventh paragraph

+

Twelfth paragraph

\ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/_second_json_partial.json.erb b/actionview/test/fixtures/actionpack/test/_second_json_partial.json.erb new file mode 100644 index 0000000000..5ebb7f1afd --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/_second_json_partial.json.erb @@ -0,0 +1 @@ +Third level \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/action_talk_to_layout.erb b/actionview/test/fixtures/actionpack/test/action_talk_to_layout.erb new file mode 100644 index 0000000000..36e896daa8 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/action_talk_to_layout.erb @@ -0,0 +1,2 @@ +<% @title = "Talking to the layout" -%> +Action was here! \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/calling_partial_with_layout.html.erb b/actionview/test/fixtures/actionpack/test/calling_partial_with_layout.html.erb new file mode 100644 index 0000000000..ac44bc0d81 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/calling_partial_with_layout.html.erb @@ -0,0 +1 @@ +<%= render(:layout => "layout_for_partial", :partial => "partial_for_use_in_layout", :locals => { :name => "David" }) %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/capturing.erb b/actionview/test/fixtures/actionpack/test/capturing.erb new file mode 100644 index 0000000000..1addaa40d9 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/capturing.erb @@ -0,0 +1,4 @@ +<% days = capture do %> + Dreamy days +<% end %> +<%= days %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/change_priority.html.erb b/actionview/test/fixtures/actionpack/test/change_priority.html.erb new file mode 100644 index 0000000000..5618977d05 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/change_priority.html.erb @@ -0,0 +1,2 @@ +<%= render :partial => "test/json_change_priority", formats: :json %> +HTML Template, but <%= render :partial => "test/changing_priority" %> partial \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/content_for.erb b/actionview/test/fixtures/actionpack/test/content_for.erb new file mode 100644 index 0000000000..1fb829f54c --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/content_for.erb @@ -0,0 +1 @@ +<% content_for :title do -%>Putting stuff in the title!<% end -%>Great stuff! \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/content_for_concatenated.erb b/actionview/test/fixtures/actionpack/test/content_for_concatenated.erb new file mode 100644 index 0000000000..e65f629574 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/content_for_concatenated.erb @@ -0,0 +1,3 @@ +<% content_for :title, "Putting stuff " + content_for :title, "in the title!" -%> +Great stuff! \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/content_for_with_parameter.erb b/actionview/test/fixtures/actionpack/test/content_for_with_parameter.erb new file mode 100644 index 0000000000..aeb6f73ce0 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/content_for_with_parameter.erb @@ -0,0 +1,2 @@ +<% content_for :title, "Putting stuff in the title!" -%> +Great stuff! \ No newline at end of file diff --git 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 new file mode 100644 index 0000000000..8b8a449236 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/dot.directory/render_file_with_ivar.erb @@ -0,0 +1 @@ +The secret is <%= @secret %> diff --git a/actionview/test/fixtures/actionpack/test/formatted_html_erb.html.erb b/actionview/test/fixtures/actionpack/test/formatted_html_erb.html.erb new file mode 100644 index 0000000000..1c64efabd8 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/formatted_html_erb.html.erb @@ -0,0 +1 @@ +formatted html erb \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder new file mode 100644 index 0000000000..14fd3549fb --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.builder @@ -0,0 +1 @@ +xml.test 'failed' \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/formatted_xml_erb.html.erb b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.html.erb new file mode 100644 index 0000000000..0c855a604b --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.html.erb @@ -0,0 +1 @@ +passed formatted html erb \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/formatted_xml_erb.xml.erb b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.xml.erb new file mode 100644 index 0000000000..6ca09d5304 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/formatted_xml_erb.xml.erb @@ -0,0 +1 @@ +passed formatted xml erb \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/greeting.html.erb b/actionview/test/fixtures/actionpack/test/greeting.html.erb new file mode 100644 index 0000000000..62fb0293f0 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/greeting.html.erb @@ -0,0 +1 @@ +

This is grand!

diff --git a/actionview/test/fixtures/actionpack/test/greeting.xml.erb b/actionview/test/fixtures/actionpack/test/greeting.xml.erb new file mode 100644 index 0000000000..62fb0293f0 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/greeting.xml.erb @@ -0,0 +1 @@ +

This is grand!

diff --git a/actionview/test/fixtures/actionpack/test/hello,world.erb b/actionview/test/fixtures/actionpack/test/hello,world.erb new file mode 100644 index 0000000000..bc8fa5e0ca --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/hello,world.erb @@ -0,0 +1 @@ +Hello w*rld! \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/hello.builder b/actionview/test/fixtures/actionpack/test/hello.builder new file mode 100644 index 0000000000..a471553941 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/hello.builder @@ -0,0 +1,4 @@ +xml.html do + xml.p "Hello #{@name}" + xml << render(:file => "test/greeting") +end \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/hello/hello.erb b/actionview/test/fixtures/actionpack/test/hello/hello.erb new file mode 100644 index 0000000000..6769dd60bd --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/hello/hello.erb @@ -0,0 +1 @@ +Hello world! \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/hello_world.erb b/actionview/test/fixtures/actionpack/test/hello_world.erb new file mode 100644 index 0000000000..6769dd60bd --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/hello_world.erb @@ -0,0 +1 @@ +Hello world! \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/hello_world_container.builder b/actionview/test/fixtures/actionpack/test/hello_world_container.builder new file mode 100644 index 0000000000..e48d75c405 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/hello_world_container.builder @@ -0,0 +1,3 @@ +xml.test do + render :partial => 'hello', :locals => { :xm => xml } +end \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder b/actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder new file mode 100644 index 0000000000..619a97ba96 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/hello_world_from_rxml.builder @@ -0,0 +1,3 @@ +xml.html do + xml.p "Hello" +end diff --git a/actionview/test/fixtures/actionpack/test/hello_world_with_layout_false.erb b/actionview/test/fixtures/actionpack/test/hello_world_with_layout_false.erb new file mode 100644 index 0000000000..6769dd60bd --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/hello_world_with_layout_false.erb @@ -0,0 +1 @@ +Hello world! \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/hello_world_with_partial.html.erb b/actionview/test/fixtures/actionpack/test/hello_world_with_partial.html.erb new file mode 100644 index 0000000000..ec31545356 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/hello_world_with_partial.html.erb @@ -0,0 +1,2 @@ +Hello world! +<%= render '/test/partial' %> diff --git a/actionview/test/fixtures/actionpack/test/hello_xml_world.builder b/actionview/test/fixtures/actionpack/test/hello_xml_world.builder new file mode 100644 index 0000000000..e7081b89fe --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/hello_xml_world.builder @@ -0,0 +1,11 @@ +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 diff --git a/actionview/test/fixtures/actionpack/test/html_template.html.erb b/actionview/test/fixtures/actionpack/test/html_template.html.erb new file mode 100644 index 0000000000..1bbc2b7f09 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/html_template.html.erb @@ -0,0 +1 @@ +<%= render :partial => "test/first_json_partial", formats: :json %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/hyphen-ated.erb b/actionview/test/fixtures/actionpack/test/hyphen-ated.erb new file mode 100644 index 0000000000..cd0875583a --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/hyphen-ated.erb @@ -0,0 +1 @@ +Hello world! diff --git a/actionview/test/fixtures/actionpack/test/implicit_content_type.atom.builder b/actionview/test/fixtures/actionpack/test/implicit_content_type.atom.builder new file mode 100644 index 0000000000..2fcb32d247 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/implicit_content_type.atom.builder @@ -0,0 +1,2 @@ +xml.atom do +end diff --git a/actionview/test/fixtures/actionpack/test/list.erb b/actionview/test/fixtures/actionpack/test/list.erb new file mode 100644 index 0000000000..0a4bda58ee --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/list.erb @@ -0,0 +1 @@ +<%= @test_unchanged = 'goodbye' %><%= render :partial => 'customer', :collection => @customers %><%= @test_unchanged %> diff --git a/actionview/test/fixtures/actionpack/test/non_erb_block_content_for.builder b/actionview/test/fixtures/actionpack/test/non_erb_block_content_for.builder new file mode 100644 index 0000000000..d539a425a4 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/non_erb_block_content_for.builder @@ -0,0 +1,4 @@ +content_for :title do + 'Putting stuff in the title!' +end +xml << "Great stuff!" diff --git a/actionview/test/fixtures/actionpack/test/potential_conflicts.erb b/actionview/test/fixtures/actionpack/test/potential_conflicts.erb new file mode 100644 index 0000000000..a5e964e359 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/potential_conflicts.erb @@ -0,0 +1,4 @@ +First: <%= @name %> +<%= render :partial => "person", :locals => { :name => "Stephan" } -%> +Fourth: <%= @name %> +Fifth: <%= name %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/proper_block_detection.erb b/actionview/test/fixtures/actionpack/test/proper_block_detection.erb new file mode 100644 index 0000000000..b55efbb25d --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/proper_block_detection.erb @@ -0,0 +1 @@ +<%= @todo %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/render_file_from_template.html.erb b/actionview/test/fixtures/actionpack/test/render_file_from_template.html.erb new file mode 100644 index 0000000000..fde9f4bb64 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/render_file_from_template.html.erb @@ -0,0 +1 @@ +<%= render :file => @path %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/render_file_with_ivar.erb b/actionview/test/fixtures/actionpack/test/render_file_with_ivar.erb new file mode 100644 index 0000000000..8b8a449236 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/render_file_with_ivar.erb @@ -0,0 +1 @@ +The secret is <%= @secret %> diff --git a/actionview/test/fixtures/actionpack/test/render_file_with_locals.erb b/actionview/test/fixtures/actionpack/test/render_file_with_locals.erb new file mode 100644 index 0000000000..ebe09faee6 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/render_file_with_locals.erb @@ -0,0 +1 @@ +The secret is <%= secret %> diff --git 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 new file mode 100644 index 0000000000..9b4900acc5 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/render_file_with_locals_and_default.erb @@ -0,0 +1 @@ +<%= secret ||= 'one' %> \ No newline at end of file diff --git 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 new file mode 100644 index 0000000000..0740b2d07c --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/render_implicit_html_template_from_xhr_request.da.html.erb @@ -0,0 +1 @@ +Hey HTML! diff --git 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 new file mode 100644 index 0000000000..4a11845cfe --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/render_implicit_html_template_from_xhr_request.html.erb @@ -0,0 +1 @@ +Hello HTML! \ No newline at end of file diff --git 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 new file mode 100644 index 0000000000..892ae5eca2 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/render_implicit_js_template_without_layout.js.erb @@ -0,0 +1 @@ +alert('hello'); \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/render_partial_inside_directory.html.erb b/actionview/test/fixtures/actionpack/test/render_partial_inside_directory.html.erb new file mode 100644 index 0000000000..1461b95186 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/render_partial_inside_directory.html.erb @@ -0,0 +1 @@ +<%= render partial: 'test/_directory/partial_with_locales', locals: {'name' => 'Jane'} %> diff --git a/actionview/test/fixtures/actionpack/test/render_to_string_test.erb b/actionview/test/fixtures/actionpack/test/render_to_string_test.erb new file mode 100644 index 0000000000..6e267e8634 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/render_to_string_test.erb @@ -0,0 +1 @@ +The value of foo is: ::<%= @foo %>:: diff --git a/actionview/test/fixtures/actionpack/test/render_two_partials.html.erb b/actionview/test/fixtures/actionpack/test/render_two_partials.html.erb new file mode 100644 index 0000000000..3db6025860 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/render_two_partials.html.erb @@ -0,0 +1,2 @@ +<%= render :partial => 'partial', :locals => {'first' => '1'} %> +<%= render :partial => 'partial', :locals => {'second' => '2'} %> diff --git a/actionview/test/fixtures/actionpack/test/using_layout_around_block.html.erb b/actionview/test/fixtures/actionpack/test/using_layout_around_block.html.erb new file mode 100644 index 0000000000..3d6661df9a --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/using_layout_around_block.html.erb @@ -0,0 +1 @@ +<%= render(:layout => "layout_for_partial", :locals => { :name => "David" }) do %>Inside from block<% end %> \ No newline at end of file diff --git a/actionview/test/fixtures/actionpack/test/with_html_partial.html.erb b/actionview/test/fixtures/actionpack/test/with_html_partial.html.erb new file mode 100644 index 0000000000..d84d909d64 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/with_html_partial.html.erb @@ -0,0 +1 @@ +<%= render :partial => "partial_only_html" %> diff --git a/actionview/test/fixtures/actionpack/test/with_partial.html.erb b/actionview/test/fixtures/actionpack/test/with_partial.html.erb new file mode 100644 index 0000000000..7502364cf5 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/with_partial.html.erb @@ -0,0 +1 @@ +<%= render :partial => "partial_only" %> diff --git a/actionview/test/fixtures/actionpack/test/with_partial.text.erb b/actionview/test/fixtures/actionpack/test/with_partial.text.erb new file mode 100644 index 0000000000..5f068ebf27 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/with_partial.text.erb @@ -0,0 +1 @@ +**<%= render :partial => "partial_only" %>** diff --git a/actionview/test/fixtures/actionpack/test/with_xml_template.html.erb b/actionview/test/fixtures/actionpack/test/with_xml_template.html.erb new file mode 100644 index 0000000000..e54a7cd001 --- /dev/null +++ b/actionview/test/fixtures/actionpack/test/with_xml_template.html.erb @@ -0,0 +1 @@ +<%= render :template => "test/greeting", :formats => :xml %> -- cgit v1.2.3 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') 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 From e10a25310f0fd7fb210b31124d6ea262a90b4717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?= Date: Wed, 14 Aug 2013 01:13:43 +0200 Subject: Move abstract's controller tests to AV The ones that were actually testing AV functionality and should belong in there --- actionview/test/fixtures/helpers/abc_helper.rb | 5 +++++ actionview/test/fixtures/helpers/fun/games_helper.rb | 5 +++++ actionview/test/fixtures/helpers/fun/pdf_helper.rb | 5 +++++ actionview/test/fixtures/helpers/helpery_test_helper.rb | 5 +++++ actionview/test/fixtures/helpers/just_me_helper.rb | 3 +++ actionview/test/fixtures/helpers/me_too_helper.rb | 3 +++ actionview/test/fixtures/helpers_missing/invalid_require_helper.rb | 5 +++++ 7 files changed, 31 insertions(+) create mode 100644 actionview/test/fixtures/helpers/abc_helper.rb create mode 100644 actionview/test/fixtures/helpers/fun/games_helper.rb create mode 100644 actionview/test/fixtures/helpers/fun/pdf_helper.rb create mode 100644 actionview/test/fixtures/helpers/helpery_test_helper.rb create mode 100644 actionview/test/fixtures/helpers/just_me_helper.rb create mode 100644 actionview/test/fixtures/helpers/me_too_helper.rb create mode 100644 actionview/test/fixtures/helpers_missing/invalid_require_helper.rb (limited to 'actionview/test/fixtures') diff --git a/actionview/test/fixtures/helpers/abc_helper.rb b/actionview/test/fixtures/helpers/abc_helper.rb new file mode 100644 index 0000000000..7104ff3730 --- /dev/null +++ b/actionview/test/fixtures/helpers/abc_helper.rb @@ -0,0 +1,5 @@ +module AbcHelper + def bare_a() end + def bare_b() end + def bare_c() end +end diff --git a/actionview/test/fixtures/helpers/fun/games_helper.rb b/actionview/test/fixtures/helpers/fun/games_helper.rb new file mode 100644 index 0000000000..3b7adce086 --- /dev/null +++ b/actionview/test/fixtures/helpers/fun/games_helper.rb @@ -0,0 +1,5 @@ +module Fun + module GamesHelper + def stratego() "Iz guuut!" end + end +end \ No newline at end of file diff --git a/actionview/test/fixtures/helpers/fun/pdf_helper.rb b/actionview/test/fixtures/helpers/fun/pdf_helper.rb new file mode 100644 index 0000000000..0171be8500 --- /dev/null +++ b/actionview/test/fixtures/helpers/fun/pdf_helper.rb @@ -0,0 +1,5 @@ +module Fun + module PdfHelper + def foobar() 'baz' end + end +end diff --git a/actionview/test/fixtures/helpers/helpery_test_helper.rb b/actionview/test/fixtures/helpers/helpery_test_helper.rb new file mode 100644 index 0000000000..a4f2951efa --- /dev/null +++ b/actionview/test/fixtures/helpers/helpery_test_helper.rb @@ -0,0 +1,5 @@ +module HelperyTestHelper + def helpery_test + "Default" + end +end diff --git a/actionview/test/fixtures/helpers/just_me_helper.rb b/actionview/test/fixtures/helpers/just_me_helper.rb new file mode 100644 index 0000000000..b140a7b9b4 --- /dev/null +++ b/actionview/test/fixtures/helpers/just_me_helper.rb @@ -0,0 +1,3 @@ +module JustMeHelper + def me() "mine!" end +end \ No newline at end of file diff --git a/actionview/test/fixtures/helpers/me_too_helper.rb b/actionview/test/fixtures/helpers/me_too_helper.rb new file mode 100644 index 0000000000..ce56042143 --- /dev/null +++ b/actionview/test/fixtures/helpers/me_too_helper.rb @@ -0,0 +1,3 @@ +module MeTooHelper + def me() "me too!" end +end \ No newline at end of file diff --git a/actionview/test/fixtures/helpers_missing/invalid_require_helper.rb b/actionview/test/fixtures/helpers_missing/invalid_require_helper.rb new file mode 100644 index 0000000000..d8801e54d5 --- /dev/null +++ b/actionview/test/fixtures/helpers_missing/invalid_require_helper.rb @@ -0,0 +1,5 @@ +require 'very_invalid_file_name' + +module InvalidRequireHelper +end + -- cgit v1.2.3