0
@@ -101,8 +101,12 @@ module Webrat
0
   
0
   class ButtonField < Field
0
 
0
+    def matches_text?(text)
0
+      @element.innerHTML =~ /#{Regexp.escape(text.to_s)}/i
0
+    end
0
+
0
     def matches_value?(value)
0
-      @element["value"] =~ /^\W*#{Regexp.escape(value.to_s)}/i
0
+      @element["value"] =~ /^\W*#{Regexp.escape(value.to_s)}/i || matches_text?(value)
0
     end
0
 
0
     def to_param

0
@@ -45,7 +45,7 @@ module Webrat
0
       
0
       @fields = []
0
       
0
-      (@element / "input, textarea, select").each do |field_element|
0
+      (@element / "button, input, textarea, select").each do |field_element|
0
         @fields << Field.class_for_element(field_element).new(self, field_element)
0
       end
0
       

0
@@ -332,4 +332,26 @@ class ClicksButtonTest < Test::Unit::TestCase
0
     @session.expects(:get_via_redirect).with("/login", "user" => {"email" => ""})
0
     @session.clicks_button
0
   end
0
+
0
+  def test_should_recognize_button_tags
0
+    @response.stubs(:body).returns(<<-EOS)
0
+      <form method="get" action="/login">
0
+        <input id="user_email" name="user[email]" value="" type="text" />
0
+        <button type="submit" />
0
+      </form>
0
+    EOS
0
+    @session.expects(:get_via_redirect).with("/login", "user" => {"email" => ""})
0
+    @session.clicks_button
0
+  end
0
+
0
+  def test_should_recognize_button_tags_by_content
0
+    @response.stubs(:body).returns(<<-EOS)
0
+      <form method="get" action="/login">
0
+        <input id="user_email" name="user[email]" value="" type="text" />
0
+        <button type="submit">Login</button>
0
+      </form>
0
+    EOS
0
+    @session.expects(:get_via_redirect).with("/login", "user" => {"email" => ""})
0
+    @session.clicks_button "Login"
0
+  end
0
 end