@@ -152,7 +152,9 @@ module Webrat begin value = yield rescue Exception => e - raise e unless yieldable_exceptions.include?(e.class) + unless is_ignorable_wait_for_exception?(e) + raise e + end end return value if value @@ -187,14 +189,13 @@ module Webrat end - def yieldable_exceptions - return [::Selenium::CommandError, Webrat::WebratError] unless lib_defined?(::Spec::Expectations::ExpectationNotMetError) - [::Spec::Expectations::ExpectationNotMetError, ::Selenium::CommandError, Webrat::WebratError] - end - protected - def lib_defined?(library) - defined?(library) + def is_ignorable_wait_for_exception?(exception) #:nodoc: + if defined?(::Spec::Expectations::ExpectationNotMetError) + return true if exception.class == ::Spec::Expectations::ExpectationNotMetError + end + return true if [::Selenium::CommandError, Webrat::WebratError].include?(exception.class) + return false end def setup #:nodoc: lib/webrat/selenium/selenium_session.rb @@ -10,19 +10,9 @@ describe Webrat::SeleniumSession do @selenium = Webrat::SeleniumSession.new() end - it "should provide a list yieldable exceptions without spec if spec isn't defined" do - @selenium.should_receive(:lib_defined?).with(::Spec::Expectations::ExpectationNotMetError).and_return(false) - @selenium.yieldable_exceptions.should == [::Selenium::CommandError, Webrat::WebratError] - end - - it "should provide a list yieldable exceptions with rspec" do - @selenium.should_receive(:lib_defined?).with(::Spec::Expectations::ExpectationNotMetError).and_return(true) - @selenium.yieldable_exceptions.should == [::Spec::Expectations::ExpectationNotMetError, ::Selenium::CommandError, Webrat::WebratError] - end - it "should throw timeout instead of spec expectionnotmet error" do lambda { - @selenium.wait_for(:timeout => 0.1) do + @selenium.wait_for(:timeout => 0.0001) do raise ::Spec::Expectations::ExpectationNotMetError end }.should raise_error(Webrat::TimeoutError) @@ -30,7 +20,7 @@ describe Webrat::SeleniumSession do it "should throw timeout instead of selenium command error" do lambda { - @selenium.wait_for(:timeout => 0.1) do + @selenium.wait_for(:timeout => 0.0001) do raise ::Selenium::CommandError end }.should raise_error(Webrat::TimeoutError) @@ -38,7 +28,7 @@ describe Webrat::SeleniumSession do it "should throw timeout instead of webrat error" do lambda { - @selenium.wait_for(:timeout => 0.1) do + @selenium.wait_for(:timeout => 0.0001) do raise Webrat::WebratError.new end }.should raise_error(Webrat::TimeoutError) spec/public/selenium/selenium_session_spec.rb dd8688f371fae494e3fa070f272342d9b2c5f2fa Mike Gaffney mike.gaffney@asolutions.com http://github.com/brynary/webrat/commit/6bfdcc54cc82b23d268987e758d7676db1061fee 6bfdcc54cc82b23d268987e758d7676db1061fee 2009-06-05T11:51:55-07:00 2009-06-05T11:50:39-07:00 Fixed Spec in Test Unit more thoroghly a56717f733b25a95fd627a8205f0474328ad57b3 Mike Gaffney mike.gaffney@asolutions.com