Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into rack

  • Loading branch information...
commit 25c1d7c7835d847616d168e9c90de5701b19da47 2 parents 0c7fa65 + d9ebabf
@brynary authored
View
8 spec/public/matchers/contain_spec.rb
@@ -56,13 +56,13 @@
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 @@
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
View
4 spec/public/matchers/have_selector_spec.rb
@@ -122,7 +122,7 @@
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 @@
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
View
4 spec/public/matchers/have_xpath_spec.rb
@@ -117,7 +117,7 @@
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 @@
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
View
2  spec/spec_helper.rb
@@ -8,6 +8,8 @@
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")
Please sign in to comment.
Something went wrong with that request. Please try again.