remove commented code and make assert_contain use a true assertion

This commit is contained in:
Amos King 2009-01-13 22:14:49 -06:00
parent a396758da4
commit cdd390a19d
3 changed files with 3 additions and 3 deletions

View File

@ -55,14 +55,14 @@ module Webrat
# the supplied string or regexp # the supplied string or regexp
def assert_contain(content) def assert_contain(content)
hc = HasContent.new(content) hc = HasContent.new(content)
raise Test::Unit::AssertionFailedError.new(hc.failure_message) unless hc.matches?(response_body) assert hc.matches?(response_body), hc.failure_message
end end
# Asserts that the body of the response # Asserts that the body of the response
# does not contain the supplied string or regepx # does not contain the supplied string or regepx
def assert_not_contain(content) def assert_not_contain(content)
hc = HasContent.new(content) hc = HasContent.new(content)
raise Test::Unit::AssertionFailedError.new(hc.negative_failure_message) if hc.matches?(response_body) assert !hc.matches?(response_body), hc.negative_failure_message
end end
end end

View File

@ -88,7 +88,6 @@ module ActionController #:nodoc:
IntegrationTest.class_eval do IntegrationTest.class_eval do
include Webrat::Methods include Webrat::Methods
include Webrat::Selenium::Methods include Webrat::Selenium::Methods
# include Webrat::Matchers
include Webrat::Selenium::Matchers include Webrat::Selenium::Matchers
end end
end end

View File

@ -254,6 +254,7 @@ describe Webrat::Matchers do
end end
describe "asserts for contains," do describe "asserts for contains," do
include Test::Unit::Assertions
before(:each) do before(:each) do
should_receive(:response_body).and_return @body should_receive(:response_body).and_return @body
require 'test/unit' require 'test/unit'