diff --git a/spec/public/matchers/contain_spec.rb b/spec/public/matchers/contain_spec.rb index 1157ba6..e0677ac 100644 --- a/spec/public/matchers/contain_spec.rb +++ b/spec/public/matchers/contain_spec.rb @@ -56,13 +56,13 @@ describe "contain" do it "should throw an exception when the body doesnt contain the text" do lambda { assert_contain("monkeys") - }.should raise_error(Test::Unit::AssertionFailedError) + }.should raise_error(AssertionFailedError) end it "should throw an exception when the body doesnt contain the regexp" do lambda { assert_contain(/monkeys/) - }.should raise_error(Test::Unit::AssertionFailedError) + }.should raise_error(AssertionFailedError) end end @@ -78,13 +78,13 @@ describe "contain" do it "should throw an exception when the body does contain the text" do lambda { assert_not_contain("hello, world") - }.should raise_error(Test::Unit::AssertionFailedError) + }.should raise_error(AssertionFailedError) end it "should throw an exception when the body does contain the regexp" do lambda { assert_not_contain(/hello, world/) - }.should raise_error(Test::Unit::AssertionFailedError) + }.should raise_error(AssertionFailedError) end end end diff --git a/spec/public/matchers/have_selector_spec.rb b/spec/public/matchers/have_selector_spec.rb index d7008a9..79e9e74 100644 --- a/spec/public/matchers/have_selector_spec.rb +++ b/spec/public/matchers/have_selector_spec.rb @@ -122,7 +122,7 @@ describe "have_selector" do it "should throw an exception when the body doesnt have matching selection" do lambda { assert_have_selector("p") - }.should raise_error(Test::Unit::AssertionFailedError) + }.should raise_error(AssertionFailedError) end end @@ -134,7 +134,7 @@ describe "have_selector" do it "should throw an exception when the body does contain the selection" do lambda { assert_have_no_selector("div") - }.should raise_error(Test::Unit::AssertionFailedError) + }.should raise_error(AssertionFailedError) end end end diff --git a/spec/public/matchers/have_xpath_spec.rb b/spec/public/matchers/have_xpath_spec.rb index 1f6b481..e1c880e 100644 --- a/spec/public/matchers/have_xpath_spec.rb +++ b/spec/public/matchers/have_xpath_spec.rb @@ -117,7 +117,7 @@ describe "have_xpath" do it "should throw an exception when the body doesnt have matching xpath" do lambda { assert_have_xpath("//p") - }.should raise_error(Test::Unit::AssertionFailedError) + }.should raise_error(AssertionFailedError) end end @@ -129,7 +129,7 @@ describe "have_xpath" do it "should throw an exception when the body does contain the xpath" do lambda { assert_have_no_xpath("//div") - }.should raise_error(Test::Unit::AssertionFailedError) + }.should raise_error(AssertionFailedError) end end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 084ff85..a64e39d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,6 +8,8 @@ begin require "redgreen" unless ENV['TM_CURRENT_LINE']; rescue LoadError; end webrat_path = File.expand_path(File.dirname(__FILE__) + "/../lib/") $LOAD_PATH.unshift(webrat_path) unless $LOAD_PATH.include?(webrat_path) +AssertionFailedError = Test::Unit::AssertionFailedError rescue MiniTest::Assertion # ruby1.9 compat + require "webrat" require File.expand_path(File.dirname(__FILE__) + "/fakes/test_session")