Merge pull request #26131 from smellsblue/dont-fail-on-non-string

Remove dead code and ensure values are strings before calling gsub
rails · Aug 12, 2016 · 64d5785 · 64d5785
2 parents fecc67d + efd59ab
commit 64d5785
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -147,7 +147,6 @@ def tag_options(options, escape = true)
               elsif BOOLEAN_ATTRIBUTES.include?(key)
                 attrs << %(#{key}="#{key}") if value
               elsif !value.nil?
-                final_value = value.is_a?(Array) ? value.join(" ") : value
                 attrs << tag_option(key, value, escape)
               end
             end
@@ -159,7 +158,7 @@ def tag_option(key, value, escape)
           if value.is_a?(Array)
             value = escape ? safe_join(value, " ") : value.join(" ")
           else
-            value = escape ? ERB::Util.html_escape(value) : value
+            value = escape ? ERB::Util.html_escape(value) : value.to_s
           end
           %(#{key}="#{value.gsub(/"/, '&quot;'.freeze)}")
         end

diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb
@@ -29,6 +29,14 @@ def test_tag_options_accepts_blank_option
     assert_equal "<p included=\"\" />", tag("p", :included => '')
   end
 
+  def test_tag_options_accepts_symbol_option_when_not_escaping
+    assert_equal "<p value=\"symbol\" />", tag("p", { :value => :symbol }, false, false)
+  end
+
+  def test_tag_options_accepts_integer_option_when_not_escaping
+    assert_equal "<p value=\"42\" />", tag("p", { :value => 42 }, false, false)
+  end
+
   def test_tag_options_converts_boolean_option
     assert_equal '<p disabled="disabled" multiple="multiple" readonly="readonly" />',
       tag("p", :disabled => true, :multiple => true, :readonly => true)