From a65a3bde0bee7d3d28c30775ec955260ed61e96c Mon Sep 17 00:00:00 2001 From: Marek Date: Mon, 27 Jun 2016 19:00:54 +0200 Subject: New syntax for tag helpers i.e. tag.br instead of tag(br) #25195 --- .../test/_builder_tag_nested_in_content_tag.erb | 3 + actionview/test/template/tag_helper_test.rb | 164 ++++++++++++++++++++- 2 files changed, 163 insertions(+), 4 deletions(-) create mode 100644 actionview/test/fixtures/test/_builder_tag_nested_in_content_tag.erb (limited to 'actionview/test') diff --git a/actionview/test/fixtures/test/_builder_tag_nested_in_content_tag.erb b/actionview/test/fixtures/test/_builder_tag_nested_in_content_tag.erb new file mode 100644 index 0000000000..ddad7ec3ac --- /dev/null +++ b/actionview/test/fixtures/test/_builder_tag_nested_in_content_tag.erb @@ -0,0 +1,3 @@ +<%= tag.p do %> + <%= tag.b 'Hello' %> +<% end %> diff --git a/actionview/test/template/tag_helper_test.rb b/actionview/test/template/tag_helper_test.rb index f3956a31f6..4ed3252c63 100644 --- a/actionview/test/template/tag_helper_test.rb +++ b/actionview/test/template/tag_helper_test.rb @@ -11,6 +11,24 @@ class TagHelperTest < ActionView::TestCase assert_equal "
", tag("br", nil, true) end + def test_tag_builder + assert_equal "", tag.span + assert_equal "", tag.span(class: "bookmark") + end + + def test_tag_builder_void_tag + assert_equal "
", tag.br + assert_equal "
", tag.br(class: 'some_class') + end + + def test_tag_builder_void_tag_with_forced_content + assert_equal "
some content
", tag.br("some content") + end + + def test_tag_builder_is_singleton + assert_equal tag, tag + end + def test_tag_options str = tag("p", "class" => "show", :class => "elsewhere") assert_match(/class="show"/, str) @@ -21,19 +39,36 @@ class TagHelperTest < ActionView::TestCase assert_equal "

", tag("p", :ignored => nil) end + def test_tag_builder_options_rejects_nil_option + assert_equal "

", tag.p(ignored: nil) + end + def test_tag_options_accepts_false_option assert_equal "

", tag("p", :value => false) end + def test_tag_builder_options_accepts_false_option + assert_equal "

", tag.p(value: false) + end + def test_tag_options_accepts_blank_option assert_equal "

", tag("p", :included => '') end + def test_tag_builder_options_accepts_blank_option + assert_equal "

", tag.p(included: '') + end + def test_tag_options_converts_boolean_option assert_dom_equal '

', tag("p", :disabled => true, :itemscope => true, :multiple => true, :readonly => true, :allowfullscreen => true, :seamless => true, :typemustmatch => true, :sortable => true, :default => true, :inert => true, :truespeed => true) end + def test_tag_builder_options_converts_boolean_option + assert_dom_equal '

', + tag.p(disabled: true, itemscope: true, multiple: true, readonly: true, allowfullscreen: true, seamless: true, typemustmatch: true, sortable: true, default: true, inert: true, truespeed: true) + end + def test_content_tag assert_equal "Create", content_tag("a", "Create", "href" => "create") assert content_tag("a", "Create", "href" => "create").html_safe? @@ -45,43 +80,96 @@ class TagHelperTest < ActionView::TestCase content_tag(:p, '', nil, false) end + def test_tag_builder_with_content + assert_equal "

Content
", tag.div("Content", id: "post_1") + assert tag.div("Content", id: "post_1").html_safe? + assert_equal tag.div("Content", id: "post_1"), + tag.div("Content", "id": "post_1") + assert_equal "

<script>evil_js</script>

", + tag.p("") + assert_equal "

", + tag.p('', escape_attributes: false) + end + + def test_tag_builder_nested + assert_equal "
content
", + tag.div { "content" } + assert_equal "
hello
", + tag.div(id: 'header') { |tag| tag.span 'hello' } + assert_equal "
hello
", + tag.div(id: 'header') { |tag| tag.div(class: 'world') { tag.span 'hello' } } + end + def test_content_tag_with_block_in_erb buffer = render_erb("<%= content_tag(:div) do %>Hello world!<% end %>") assert_dom_equal "
Hello world!
", buffer end + def test_tag_builder_with_block_in_erb + buffer = render_erb("<%= tag.div do %>Hello world!<% end %>") + assert_dom_equal "
Hello world!
", buffer + end + def test_content_tag_with_block_in_erb_containing_non_displayed_erb buffer = render_erb("<%= content_tag(:p) do %><% 1 %><% end %>") assert_dom_equal "

", buffer end + def test_tag_builder_with_block_in_erb_containing_non_displayed_erb + buffer = render_erb("<%= tag.p do %><% 1 %><% end %>") + assert_dom_equal "

", buffer + end + def test_content_tag_with_block_and_options_in_erb buffer = render_erb("<%= content_tag(:div, :class => 'green') do %>Hello world!<% end %>") assert_dom_equal %(
Hello world!
), buffer end + def test_tag_builder_with_block_and_options_in_erb + buffer = render_erb("<%= tag.div(class: 'green') do %>Hello world!<% end %>") + assert_dom_equal %(
Hello world!
), buffer + end + def test_content_tag_with_block_and_options_out_of_erb assert_dom_equal %(
Hello world!
), content_tag(:div, :class => "green") { "Hello world!" } end + def test_tag_builder_with_block_and_options_out_of_erb + assert_dom_equal %(
Hello world!
), tag.div(class: "green") { "Hello world!" } + end + def test_content_tag_with_block_and_options_outside_out_of_erb assert_equal content_tag("a", "Create", :href => "create"), content_tag("a", "href" => "create") { "Create" } end + def test_tag_builder_with_block_and_options_outside_out_of_erb + assert_equal tag.a("Create", href: "create"), + tag.a("href": "create") { "Create" } + end + def test_content_tag_with_block_and_non_string_outside_out_of_erb assert_equal content_tag("p"), content_tag("p") { 3.times { "do_something" } } end + def test_tag_builder_with_block_and_non_string_outside_out_of_erb + assert_equal tag.p, + tag.p { 3.times { "do_something" } } + end + def test_content_tag_nested_in_content_tag_out_of_erb assert_equal content_tag("p", content_tag("b", "Hello")), content_tag("p") { content_tag("b", "Hello") }, output_buffer + assert_equal tag.p(tag.b("Hello")), + tag.p {tag.b("Hello") }, + output_buffer end def test_content_tag_nested_in_content_tag_in_erb assert_equal "

\n Hello\n

", view.render("test/content_tag_nested_in_content_tag") + assert_equal "

\n Hello\n

", view.render("test/builder_tag_nested_in_content_tag") end def test_content_tag_with_escaped_array_class @@ -95,6 +183,17 @@ class TagHelperTest < ActionView::TestCase assert_equal "

limelight

", str end + def test_tag_builder_with_escaped_array_class + str = tag.p "limelight", class: ["song", "play>"] + assert_equal "

limelight

", str + + str = tag.p "limelight", class: ["song", "play"] + assert_equal "

limelight

", str + + str = tag.p "limelight", class: ["song", ["play"]] + assert_equal "

limelight

", str + end + def test_content_tag_with_unescaped_array_class str = content_tag('p', "limelight", {:class => ["song", "play>"]}, false) assert_equal "

\">limelight

", str @@ -103,21 +202,43 @@ class TagHelperTest < ActionView::TestCase assert_equal "

\">limelight

", str end + def test_tag_builder_with_unescaped_array_class + str = tag.p "limelight", class: ["song", "play>"], escape_attributes: false + assert_equal "

\">limelight

", str + + str = tag.p "limelight", class: ["song", ["play>"]], escape_attributes: false + assert_equal "

\">limelight

", str + end + def test_content_tag_with_empty_array_class str = content_tag('p', 'limelight', {:class => []}) assert_equal '

limelight

', str end + def test_tag_builder_with_empty_array_class + assert_equal '

limelight

', tag.p('limelight', class: []) + end + def test_content_tag_with_unescaped_empty_array_class str = content_tag('p', 'limelight', {:class => []}, false) assert_equal '

limelight

', str end + def test_tag_builder_with_unescaped_empty_array_class + str = tag.p 'limelight', class: [], escape_attributes: false + assert_equal '

limelight

', str + end + def test_content_tag_with_data_attributes assert_dom_equal '

limelight

', content_tag('p', "limelight", data: { number: 1, string: 'hello', string_with_quotes: 'double"quote"party"' }) end + def test_tag_builder_with_data_attributes + assert_dom_equal '

limelight

', + tag.p("limelight", data: { number: 1, string: 'hello', string_with_quotes: 'double"quote"party"' }) + end + def test_cdata_section assert_equal "]]>", cdata_section("") end @@ -139,20 +260,24 @@ class TagHelperTest < ActionView::TestCase def test_tag_honors_html_safe_for_param_values ['1&2', '1 < 2', '“test“'].each do |escaped| assert_equal %(), tag('a', :href => escaped.html_safe) + assert_equal %(), tag.a(href: escaped.html_safe) end end def test_tag_honors_html_safe_with_escaped_array_class - str = tag('p', :class => ['song>', raw('play>')]) - assert_equal '

', str + assert_equal '

', tag('p', :class => ['song>', raw('play>')]) + assert_equal '

', tag('p', :class => [raw('song>'), 'play>']) + end - str = tag('p', :class => [raw('song>'), 'play>']) - assert_equal '

', str + def test_tag_builder_honors_html_safe_with_escaped_array_class + assert_equal '

', tag.p(class: ['song>', raw('play>')]) + assert_equal '

', tag.p(class: [raw('song>'), 'play>']) end def test_skip_invalid_escaped_attributes ['&1;', 'dfa3;', '& #123;'].each do |escaped| assert_equal %(), tag('a', :href => escaped) + assert_equal %(), tag.a(href: escaped) end end @@ -160,10 +285,20 @@ class TagHelperTest < ActionView::TestCase assert_equal '', tag('a', { :href => '&' }, false, false) end + def test_tag_builder_disable_escaping + assert_equal '', tag.a(href: '&', escape_attributes: false) + assert_equal 'cnt', tag.a(href: '&' , escape_attributes: false) { "cnt"} + assert_equal '
', tag.br("data-hidden": '&' , escape_attributes: false) + assert_equal 'content', tag.a("content", href: '&', escape_attributes: false) + assert_equal 'content', tag.a(href: '&', escape_attributes: false) { "content"} + end + def test_data_attributes ['data', :data].each { |data| assert_dom_equal '', tag('a', { data => { a_float: 3.14, a_big_decimal: BigDecimal.new("-123.456"), a_number: 1, string: 'hello', symbol: :foo, array: [1, 2, 3], hash: { key: 'value'}, string_with_quotes: 'double"quote"party"' } }) + assert_dom_equal '', + tag.a(data: { a_float: 3.14, a_big_decimal: BigDecimal.new("-123.456"), a_number: 1, string: 'hello', symbol: :foo, array: [1, 2, 3], hash: { key: 'value'}, string_with_quotes: 'double"quote"party"' }) } end @@ -171,6 +306,8 @@ class TagHelperTest < ActionView::TestCase ['aria', :aria].each { |aria| assert_dom_equal '', tag('a', { aria => { a_float: 3.14, a_big_decimal: BigDecimal.new("-123.456"), a_number: 1, string: 'hello', symbol: :foo, array: [1, 2, 3], hash: { key: 'value'}, string_with_quotes: 'double"quote"party"' } }) + assert_dom_equal '', + tag.a(aria: { a_float: 3.14, a_big_decimal: BigDecimal.new("-123.456"), a_number: 1, string: 'hello', symbol: :foo, array: [1, 2, 3], hash: { key: 'value'}, string_with_quotes: 'double"quote"party"' }) } end @@ -179,4 +316,23 @@ class TagHelperTest < ActionView::TestCase div_type2 = content_tag(:div, 'test', { data: {tooltip: nil} }) assert_dom_equal div_type1, div_type2 end + + def test_tag_builder_link_to_data_nil_equal + div_type1 = tag.div 'test', { 'data-tooltip': nil } + div_type2 = tag.div 'test', { data: {tooltip: nil} } + assert_dom_equal div_type1, div_type2 + end + + def test_tag_builder_allow_call_via_method_object + assert_equal "", tag.method(:foo).call + end + + def test_tag_builder_dasherize_names + assert_equal "", tag.img_slider + end + + def test_respond_to + assert_respond_to tag, :any_tag + end + end -- cgit v1.2.3