From 44745f689164ca1b53b1af6277cb361395e42bd9 Mon Sep 17 00:00:00 2001
From: Gwyn Morfey <gwyn@new-bamboo.co.uk>
Date: Wed, 16 Apr 2008 15:35:10 +0100
Subject: [PATCH] Fixed Webrat not finding <button type='submit'>

---
 .gitignore                 |  3 ++-
 lib/webrat/field.rb        |  3 +--
 lib/webrat/form.rb         |  2 +-
 test/clicks_button_test.rb | 17 +++++++++++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 98fe2cf..eb06048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
+.DS_Store
 pkg
 doc
 ri
-email.txt
\ No newline at end of file
+email.txt
diff --git a/lib/webrat/field.rb b/lib/webrat/field.rb
index 7c28798..ee99d26 100644
--- a/lib/webrat/field.rb
+++ b/lib/webrat/field.rb
@@ -3,7 +3,7 @@ module Webrat
     
     def self.class_for_element(element)
       if element.name == "input"
-        if %w[submit image].include?(element["type"])
+        if %w[submit image button].include?(element["type"])
           field_class = "button"
         else
           field_class = element["type"] || "text" #default type; 'type' attribute is not mandatory
@@ -11,7 +11,6 @@ module Webrat
       else
         field_class = element.name
       end
-      
       Webrat.const_get("#{field_class.capitalize}Field")
     #rescue NameError
     #  raise "Invalid field element: #{element.inspect}"
diff --git a/lib/webrat/form.rb b/lib/webrat/form.rb
index 50c2e2d..923e5c9 100644
--- a/lib/webrat/form.rb
+++ b/lib/webrat/form.rb
@@ -45,7 +45,7 @@ module Webrat
       
       @fields = []
       
-      (@element / "input, textarea, select").each do |field_element|
+      (@element / "input, textarea, select, button").each do |field_element|
         @fields << Field.class_for_element(field_element).new(self, field_element)
       end
       
diff --git a/test/clicks_button_test.rb b/test/clicks_button_test.rb
index a309f4c..26a8b9a 100644
--- a/test/clicks_button_test.rb
+++ b/test/clicks_button_test.rb
@@ -77,6 +77,23 @@ class ClicksButtonTest < Test::Unit::TestCase
     @session.clicks_button
   end
   
+  #<button type='submit'> is also valid HTML.
+  def test_should_work_with_button_submit
+    @response.stubs(:body).returns(<<-EOS)
+<form action="/form1" method="post"><p><label for="login">Login</label><br/>
+
+<input type="text" class="text" name="login"/></p>
+
+<p><label for="password">Password</label><br/>
+<input type="password" class="password" name="password"/></p>
+<p><button type="submit">Log in</button></p>
+</form>
+
+    EOS
+    @session.expects(:post_via_redirect)
+    @session.clicks_button
+  end  
+  
   def test_should_not_explode_on_file_fields
     @response.stubs(:body).returns(<<-EOS)
       <form method="get" action="/form1">