Always raise Webrat::WebratErrors (or a subclass), not RuntimeErrors

lib/webrat/core/link.rb

@@ -106,7 +106,7 @@ module Webrat
       elsif onclick.include?("m.setAttribute('value', 'put')")
         :put
       else
-        raise "No HTTP method for _method param in #{onclick.inspect}"
+        raise Webrat::WebratError.new("No HTTP method for _method param in #{onclick.inspect}")
       end
     end
 

spec/api/click_link_spec.rb

@@ -184,7 +184,7 @@ describe "click_link" do
     
     lambda {
       click_link "Link"
-    }.should raise_error
+    }.should raise_error(Webrat::WebratError)
   end
   
   it "should assert valid response" do
@@ -212,7 +212,7 @@ describe "click_link" do
     
     lambda {
       click_link "Missing link"
-    }.should raise_error
+    }.should raise_error(Webrat::NotFoundError)
   end
   
   it "should not be case sensitive" do

spec/api/fill_in_spec.rb

@@ -100,7 +100,7 @@ describe "fill_in" do
       </form>
     HTML
     
-    lambda { fill_in "mail", :with => "value" }.should raise_error
+    lambda { fill_in "mail", :with => "value" }.should raise_error(Webrat::NotFoundError)
   end
   
   it "should anchor label matches to word boundaries" do
@@ -111,7 +111,7 @@ describe "fill_in" do
       </form>
     HTML
     
-    lambda { fill_in "Email", :with => "value" }.should raise_error
+    lambda { fill_in "Email", :with => "value" }.should raise_error(Webrat::NotFoundError)
   end
   
   it "should work with inputs nested in labels" do

spec/api/selects_date_spec.rb

@@ -74,7 +74,7 @@ describe "select_date" do
       </form>
     HTML
     
-    lambda { select_date "December 25, 2003", :from => "date" }.should raise_error
+    lambda { select_date "December 25, 2003", :from => "date" }.should raise_error(Webrat::NotFoundError)
   end
 
 end

spec/api/selects_datetime_spec.rb

@@ -92,7 +92,7 @@ describe "select_datetime" do
       </form>
     HTML
     
-    lambda { select_datetime "December 25, 2003 9:30", :from => "Time" }.should raise_error
+    lambda { select_datetime "December 25, 2003 9:30", :from => "Time" }.should raise_error(Webrat::NotFoundError)
   end
 
 end

spec/api/selects_spec.rb

@@ -30,7 +30,7 @@ describe "select" do
       </form>
     HTML
 
-    lambda { select "February", :from => "year" }.should raise_error
+    lambda { select "February", :from => "year" }.should raise_error(Webrat::NotFoundError)
   end
 
   
@@ -42,7 +42,7 @@ describe "select" do
       </form>
     HTML
 
-    lambda { select "January", :from => "month" }.should raise_error
+    lambda { select "January", :from => "month" }.should raise_error(Webrat::DisabledFieldError)
   end
   
   it "should send value from option" do

spec/api/selects_time_spec.rb

@@ -65,7 +65,7 @@ describe "select_time" do
       </form>
     HTML
     
-    lambda { select_time "9:30", :from => "Time" }.should raise_error
+    lambda { select_time "9:30", :from => "Time" }.should raise_error(Webrat::NotFoundError)
   end
 
 end

spec/api/visit_spec.rb

@@ -14,7 +14,7 @@ describe "visit" do
   
   it "should assert valid response" do
     webrat_session.response_code = 501
-    lambda { visit("/") }.should raise_error
+    lambda { visit("/") }.should raise_error(Webrat::PageLoadError)
   end
   
   [200, 300, 400, 499].each do |status|
@@ -25,7 +25,7 @@ describe "visit" do
   end
   
   it "should require a visit before manipulating page" do
-    lambda { fill_in "foo", :with => "blah" }.should raise_error
+    lambda { fill_in "foo", :with => "blah" }.should raise_error(Webrat::WebratError)
   end
 end
 

spec/webrat/rails/attaches_file_spec.rb

@@ -12,7 +12,7 @@ describe "attach_file" do
       <form method="post" action="/widgets">
       </form>
     HTML
-    lambda { attach_file("Doc", "/some/path") }.should raise_error
+    lambda { attach_file("Doc", "/some/path") }.should raise_error(Webrat::NotFoundError)
   end
 
   it "should submit empty strings for blank file fields" do