Do not extend Object.

BaylorRae · Jan 9, 2012 · 67e27b9 · 67e27b9
1 parent 4537f89
commit 67e27b9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/lib/active_admin/arbre.rb b/lib/active_admin/arbre.rb
@@ -1,5 +1,4 @@
 require "active_admin/arbre/builder"
-require "active_admin/arbre/core_extensions"
 require "active_admin/arbre/context"
 require "active_admin/arbre/html/element"
 require "active_admin/arbre/html/attributes"

diff --git a/lib/active_admin/arbre/core_extensions.rb b/lib/active_admin/arbre/core_extensions.rb
diff --git a/lib/active_admin/arbre/html/text_node.rb b/lib/active_admin/arbre/html/text_node.rb
@@ -27,7 +27,7 @@ def tag_name
       end
 
       def to_html
-        ERB::Util.html_escape(@content.to_html)
+        ERB::Util.html_escape(@content.to_s)
       end
     end
 

diff --git a/spec/unit/arbre/html/element_spec.rb b/spec/unit/arbre/html/element_spec.rb
@@ -96,7 +96,7 @@
       it "should html escape the string" do
         string = "Goodbye <br />"
         element.content = string
-        element.content.to_html.should == "Goodbye &lt;br /&gt;"
+        element.to_html.should == "Goodbye &lt;br /&gt;"
       end
     end