Changeset 2284

Timestamp:

09/21/05 09:04:05 (3 years ago)

Author:

david

Message:

Asserts now need html/document so it should require it

Files:

• trunk/actionpack/lib/action_controller/assertions.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/test_process.rb (modified) (2 diffs)

trunk/actionpack/lib/action_controller/assertions.rb

@@ -2 +2 @@
-require 'test/unit/assertions'
-require 'rexml/document'
+require "#{File.dirname(__FILE__)}/vendor/html-scanner/html/document"
-
-module Test #:nodoc:

trunk/actionpack/lib/action_controller/test_process.rb

@@ -350 +350 @@
-
-        def html_document
-          require_html_scanner
-          @html_document ||= HTML::Document.new(@response.body)
-        end
@@ -360 +359 @@
-        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
-