From 69b5c39af473e43cca62de243727ab94247496bc Mon Sep 17 00:00:00 2001
From: Michael Holub <michael.holub@gmail.com>
Date: Sun, 18 May 2008 01:04:09 +0300
Subject: [PATCH] Patch for missing inner_content method bug in HasTag

---
 lib/merb-core/test/matchers/view_matchers.rb |    6 +++---
 spec/public/test/view_matchers_spec.rb       |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/merb-core/test/matchers/view_matchers.rb b/lib/merb-core/test/matchers/view_matchers.rb
index d6b772c..691ab69 100644
--- a/lib/merb-core/test/matchers/view_matchers.rb
+++ b/lib/merb-core/test/matchers/view_matchers.rb
@@ -251,13 +251,13 @@ module Merb::Test::Rspec::ViewMatchers
     # ==== Returns
     # String:: The failure message.
     def failure_message
-      "expected the following element's content to #{content_message}:\n#{@element.inner_content}"
+      "expected the following element's content to #{content_message}:\n#{@element.inner_text}"
     end
 
     # ==== Returns
     # String:: The failure message to be displayed in negative matches.
     def negative_failure_message
-      "expected the following element's content to not #{content_message}:\n#{@element.inner_content}"
+      "expected the following element's content to not #{content_message}:\n#{@element.inner_text}"
     end
     
     def content_message
@@ -332,4 +332,4 @@ module Merb::Test::Rspec::ViewMatchers
   def contain(content)
     HasContent.new(content)
   end
-end
\ No newline at end of file
+end
diff --git a/spec/public/test/view_matchers_spec.rb b/spec/public/test/view_matchers_spec.rb
index 753eac0..a697eee 100644
--- a/spec/public/test/view_matchers_spec.rb
+++ b/spec/public/test/view_matchers_spec.rb
@@ -132,7 +132,7 @@ describe Merb::Test::Rspec::ViewMatchers do
     describe HasContent do
       before(:each) do
         @element = stub(:element)
-        @element.stub!(:inner_content).and_return <<-EOF
+        @element.stub!(:inner_text).and_return <<-EOF
           <div id='main'>
             <div class='inner'>hello, world!</div>
           </div>
@@ -175,9 +175,9 @@ describe Merb::Test::Rspec::ViewMatchers do
           hc = HasContent.new(/hello,\sworld!/)
           hc.matches?(@element)
           
-          hc.failure_message.should include(@element.inner_content)
+          hc.failure_message.should include(@element.inner_text)
         end
       end
     end
   end
-end
\ No newline at end of file
+end
-- 
1.5.5.1