From d616b8602565671e30effe32582951567b04bffb Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 21 Sep 2005 09:04:05 +0000 Subject: [PATCH] Asserts now need html/document so it should require it git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2284 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/assertions.rb | 1 + actionpack/lib/action_controller/test_process.rb | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb index 1a501bcd74f21..7729ca991e672 100644 --- a/actionpack/lib/action_controller/assertions.rb +++ b/actionpack/lib/action_controller/assertions.rb @@ -1,6 +1,7 @@ require 'test/unit' require 'test/unit/assertions' require 'rexml/document' +require "#{File.dirname(__FILE__)}/vendor/html-scanner/html/document" module Test #:nodoc: module Unit #:nodoc: diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 5c34e9fa6d3fd..59604e7c34b8e 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -349,7 +349,6 @@ def build_request_uri(action, parameters) end def html_document - require_html_scanner @html_document ||= HTML::Document.new(@response.body) end @@ -361,14 +360,6 @@ def find_all_tag(conditions) html_document.find_all(conditions) end - def require_html_scanner - return true if defined?(HTML::Document) - require 'html/document' - rescue LoadError - $:.unshift File.dirname(__FILE__) + "/vendor/html-scanner" - require 'html/document' - end - def method_missing(selector, *args) return @controller.send(selector, *args) if ActionController::Routing::NamedRoutes::Helpers.include?(selector) return super