Adding rescue from Webrat::TimeoutError in selenium matchers which al…

…lows NegativeMatchers to behave correctly
brynary · Jan 24, 2009 · f956bea · f956bea
1 parent 18fa3ab
commit f956bea
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/History.txt b/History.txt
@@ -8,6 +8,7 @@
 
 * Bug fixes
 
+  * rescue from Webrat::TimeoutError in selenium matchers which allows NegativeMatchers to behave correctly (Noah Davis)
   * Switch to using selenium.click instead of .check when checking a checkbox
     (Noah Davis)
   * Create tmp/pids directory if directory does not exist. (Amos King and Mike Gaffney)  

diff --git a/lib/webrat/selenium/matchers/have_content.rb b/lib/webrat/selenium/matchers/have_content.rb
@@ -16,6 +16,8 @@ def matches?(response)
           response.session.wait_for do
             response.selenium.is_text_present(text_finder)
           end
+          rescue Webrat::TimeoutError
+            false
         end
 
         # ==== Returns

diff --git a/lib/webrat/selenium/matchers/have_selector.rb b/lib/webrat/selenium/matchers/have_selector.rb
@@ -10,6 +10,8 @@ def matches?(response)
           response.session.wait_for do
             response.selenium.is_element_present("css=#{@expected}")
           end
+          rescue Webrat::TimeoutError
+            false
         end
 
         # ==== Returns

diff --git a/lib/webrat/selenium/matchers/have_xpath.rb b/lib/webrat/selenium/matchers/have_xpath.rb
@@ -10,6 +10,8 @@ def matches?(response)
           response.session.wait_for do
             response.selenium.is_element_present("xpath=#{@expected}")
           end
+          rescue Webrat::TimeoutError
+            false
         end
 
         # ==== Returns