Merge pull request #11218 from kaspth/loofah-integration

Loofah-integration

Conflicts:
	actionpack/CHANGELOG.md
	actionview/CHANGELOG.md

6 files changed, 5 insertions, 1175 deletions

diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index b6b5a218cc..d541e577cf 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'action_view/vendor/html-scanner'
 require 'controller/fake_controllers'
 
 class ActionPackAssertionsController < ActionController::Base
@@ -147,11 +146,6 @@ end
 
 class ActionPackAssertionsControllerTest < ActionController::TestCase
 
-  def test_assert_tag_and_url_for
-    get :render_url
-    assert_tag :content => "/action_pack_assertions/flash_me"
-  end
-
   def test_render_file_absolute_path
     get :render_file_absolute_path
     assert_match(/\A= Action Pack/, @response.body)
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
deleted file mode 100644
index f07d201563..0000000000
--- a/actionpack/test/controller/assert_select_test.rb
+++ /dev/null
@@ -1,356 +0,0 @@
-# encoding: utf-8
-#--
-# Copyright (c) 2006 Assaf Arkin (http://labnotes.org)
-# Under MIT and/or CC By license.
-#++
-
-require 'abstract_unit'
-require 'controller/fake_controllers'
-
-require 'action_mailer'
-require 'action_view'
-
-ActionMailer::Base.send(:include, ActionView::Layouts)
-ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
-
-class AssertSelectTest < ActionController::TestCase
-  Assertion = ActiveSupport::TestCase::Assertion
-
-  class AssertSelectMailer < ActionMailer::Base
-    def test(html)
-      mail :body => html, :content_type => "text/html",
-        :subject => "Test e-mail", :from => "test@test.host", :to => "test <test@test.host>"
-    end
-  end
-
-  class AssertMultipartSelectMailer < ActionMailer::Base
-    def test(options)
-      mail :subject => "Test e-mail", :from => "test@test.host", :to => "test <test@test.host>" do |format|
-        format.text { render :text => options[:text] }
-        format.html { render :text => options[:html] }
-      end
-    end
-  end
-
-  class AssertSelectController < ActionController::Base
-    def response_with=(content)
-      @content = content
-    end
-
-    def response_with(&block)
-      @update = block
-    end
-
-    def html()
-      render :text=>@content, :layout=>false, :content_type=>Mime::HTML
-      @content = nil
-    end
-
-    def xml()
-      render :text=>@content, :layout=>false, :content_type=>Mime::XML
-      @content = nil
-    end
-  end
-
-  tests AssertSelectController
-
-  def setup
-    super
-    @old_delivery_method = ActionMailer::Base.delivery_method
-    @old_perform_deliveries = ActionMailer::Base.perform_deliveries
-    ActionMailer::Base.delivery_method = :test
-    ActionMailer::Base.perform_deliveries = true
-  end
-
-  def teardown
-    super
-    ActionMailer::Base.delivery_method = @old_delivery_method
-    ActionMailer::Base.perform_deliveries = @old_perform_deliveries
-    ActionMailer::Base.deliveries.clear
-  end
-
-  def assert_failure(message, &block)
-    e = assert_raise(Assertion, &block)
-    assert_match(message, e.message) if Regexp === message
-    assert_equal(message, e.message) if String === message
-  end
-
-  #
-  # Test assert select.
-  #
-
-  def test_assert_select
-    render_html %Q{<div id="1"></div><div id="2"></div>}
-    assert_select "div", 2
-    assert_failure(/\AExpected at least 1 element matching \"p\", found 0\.$/) { assert_select "p" }
-  end
-
-  def test_equality_integer
-    render_html %Q{<div id="1"></div><div id="2"></div>}
-    assert_failure(/\AExpected exactly 3 elements matching \"div\", found 2\.$/) { assert_select "div", 3 }
-    assert_failure(/\AExpected exactly 0 elements matching \"div\", found 2\.$/) { assert_select "div", 0 }
-  end
-
-  def test_equality_true_false
-    render_html %Q{<div id="1"></div><div id="2"></div>}
-    assert_nothing_raised    { assert_select "div" }
-    assert_raise(Assertion) { assert_select "p" }
-    assert_nothing_raised    { assert_select "div", true }
-    assert_raise(Assertion) { assert_select "p", true }
-    assert_raise(Assertion) { assert_select "div", false }
-    assert_nothing_raised    { assert_select "p", false }
-  end
-
-  def test_equality_false_message
-    render_html %Q{<div id="1"></div><div id="2"></div>}
-    assert_failure(/\AExpected exactly 0 elements matching \"div\", found 2\.$/) { assert_select "div", false }
-  end
-
-  def test_equality_string_and_regexp
-    render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
-    assert_nothing_raised    { assert_select "div", "foo" }
-    assert_raise(Assertion) { assert_select "div", "bar" }
-    assert_failure(/\A<bar> expected but was\n<foo>\.$/) { assert_select "div", "bar" }
-    assert_nothing_raised    { assert_select "div", :text=>"foo" }
-    assert_raise(Assertion) { assert_select "div", :text=>"bar" }
-    assert_nothing_raised    { assert_select "div", /(foo|bar)/ }
-    assert_raise(Assertion) { assert_select "div", /foobar/ }
-    assert_nothing_raised    { assert_select "div", :text=>/(foo|bar)/ }
-    assert_raise(Assertion) { assert_select "div", :text=>/foobar/ }
-    assert_raise(Assertion) { assert_select "p", :text=>/foobar/ }
-  end
-
-  def test_equality_of_html
-    render_html %Q{<p>\n<em>"This is <strong>not</strong> a big problem,"</em> he said.\n</p>}
-    text = "\"This is not a big problem,\" he said."
-    html = "<em>\"This is <strong>not</strong> a big problem,\"</em> he said."
-    assert_nothing_raised    { assert_select "p", text }
-    assert_raise(Assertion) { assert_select "p", html }
-    assert_nothing_raised    { assert_select "p", :html=>html }
-    assert_raise(Assertion) { assert_select "p", :html=>text }
-    assert_failure(/\A<#{text}> expected but was\n<#{html}>\.$/) { assert_select "p", :html=>text }
-    # No stripping for pre.
-    render_html %Q{<pre>\n<em>"This is <strong>not</strong> a big problem,"</em> he said.\n</pre>}
-    text = "\n\"This is not a big problem,\" he said.\n"
-    html = "\n<em>\"This is <strong>not</strong> a big problem,\"</em> he said.\n"
-    assert_nothing_raised    { assert_select "pre", text }
-    assert_raise(Assertion) { assert_select "pre", html }
-    assert_nothing_raised    { assert_select "pre", :html=>html }
-    assert_raise(Assertion) { assert_select "pre", :html=>text }
-  end
-
-  def test_strip_textarea
-    render_html %Q{<textarea>\n\nfoo\n</textarea>}
-    assert_select "textarea", "\nfoo\n"
-    render_html %Q{<textarea>\nfoo</textarea>}
-    assert_select "textarea", "foo"
-  end
-
-  def test_counts
-    render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
-    assert_nothing_raised               { assert_select "div", 2 }
-    assert_failure(/\AExpected exactly 3 elements matching \"div\", found 2\.$/) do
-      assert_select "div", 3
-    end
-    assert_nothing_raised               { assert_select "div", 1..2 }
-    assert_failure(/\AExpected between 3 and 4 elements matching \"div\", found 2\.$/) do
-      assert_select "div", 3..4
-    end
-    assert_nothing_raised               { assert_select "div", :count=>2 }
-    assert_failure(/\AExpected exactly 3 elements matching \"div\", found 2\.$/) do
-      assert_select "div", :count=>3
-    end
-    assert_nothing_raised               { assert_select "div", :minimum=>1 }
-    assert_nothing_raised               { assert_select "div", :minimum=>2 }
-    assert_failure(/\AExpected at least 3 elements matching \"div\", found 2\.$/) do
-      assert_select "div", :minimum=>3
-    end
-    assert_nothing_raised               { assert_select "div", :maximum=>2 }
-    assert_nothing_raised               { assert_select "div", :maximum=>3 }
-    assert_failure(/\AExpected at most 1 element matching \"div\", found 2\.$/) do
-      assert_select "div", :maximum=>1
-    end
-    assert_nothing_raised               { assert_select "div", :minimum=>1, :maximum=>2 }
-    assert_failure(/\AExpected between 3 and 4 elements matching \"div\", found 2\.$/) do
-      assert_select "div", :minimum=>3, :maximum=>4
-    end
-  end
-
-  def test_substitution_values
-    render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
-    assert_select "div#?", /\d+/ do |elements|
-      assert_equal 2, elements.size
-    end
-    assert_select "div" do
-      assert_select "div#?", /\d+/ do |elements|
-        assert_equal 2, elements.size
-        assert_select "#1"
-        assert_select "#2"
-      end
-    end
-  end
-
-  def test_nested_assert_select
-    render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
-    assert_select "div" do |elements|
-      assert_equal 2, elements.size
-      assert_select elements[0], "#1"
-      assert_select elements[1], "#2"
-    end
-    assert_select "div" do
-      assert_select "div" do |elements|
-        assert_equal 2, elements.size
-        # Testing in a group is one thing
-        assert_select "#1,#2"
-        # Testing individually is another.
-        assert_select "#1"
-        assert_select "#2"
-        assert_select "#3", false
-      end
-    end
-
-    assert_failure(/\AExpected at least 1 element matching \"#4\", found 0\.$/) do
-      assert_select "div" do
-        assert_select "#4"
-      end
-    end
-  end
-
-  def test_assert_select_text_match
-    render_html %Q{<div id="1"><span>foo</span></div><div id="2"><span>bar</span></div>}
-    assert_select "div" do
-      assert_nothing_raised    { assert_select "div", "foo" }
-      assert_nothing_raised    { assert_select "div", "bar" }
-      assert_nothing_raised    { assert_select "div", /\w*/ }
-      assert_nothing_raised    { assert_select "div", :text => /\w*/, :count=>2 }
-      assert_raise(Assertion)  { assert_select "div", :text=>"foo", :count=>2 }
-      assert_nothing_raised    { assert_select "div", :html=>"<span>bar</span>" }
-      assert_nothing_raised    { assert_select "div", :html=>"<span>bar</span>" }
-      assert_nothing_raised    { assert_select "div", :html=>/\w*/ }
-      assert_nothing_raised    { assert_select "div", :html=>/\w*/, :count=>2 }
-      assert_raise(Assertion)  { assert_select "div", :html=>"<span>foo</span>", :count=>2 }
-    end
-  end
-
-  def test_elect_with_xml_namespace_attributes
-    render_html %Q{<link xlink:href="http://nowhere.com"></link>}
-    assert_nothing_raised { assert_select "link[xlink:href=http://nowhere.com]" }
-  end
-
-  #
-  # Test css_select.
-  #
-
-  def test_css_select
-    render_html %Q{<div id="1"></div><div id="2"></div>}
-    assert_equal 2, css_select("div").size
-    assert_equal 0, css_select("p").size
-  end
-
-  def test_nested_css_select
-    render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
-    assert_select "div#?", /\d+/ do |elements|
-      assert_equal 1, css_select(elements[0], "div").size
-      assert_equal 1, css_select(elements[1], "div").size
-    end
-    assert_select "div" do
-      assert_equal 2, css_select("div").size
-      css_select("div").each do |element|
-        # Testing as a group is one thing
-        assert !css_select("#1,#2").empty?
-        # Testing individually is another
-        assert !css_select("#1").empty?
-        assert !css_select("#2").empty?
-      end
-    end
-  end
-
-  def test_feed_item_encoded
-    render_xml <<-EOF
-<rss version="2.0">
-  <channel>
-    <item>
-      <description>
-        <![CDATA[
-          <p>Test 1</p>
-        ]]>
-      </description>
-    </item>
-    <item>
-      <description>
-        <![CDATA[
-          <p>Test 2</p>
-        ]]>
-      </description>
-    </item>
-  </channel>
-</rss>
-EOF
-    assert_select "channel item description" do
-      # Test element regardless of wrapper.
-      assert_select_encoded do
-        assert_select "p", :count=>2, :text=>/Test/
-      end
-      # Test through encoded wrapper.
-      assert_select_encoded do
-        assert_select "encoded p", :count=>2, :text=>/Test/
-      end
-      # Use :root instead (recommended)
-      assert_select_encoded do
-        assert_select ":root p", :count=>2, :text=>/Test/
-      end
-      # Test individually.
-      assert_select "description" do |elements|
-        assert_select_encoded elements[0] do
-          assert_select "p", "Test 1"
-        end
-        assert_select_encoded elements[1] do
-          assert_select "p", "Test 2"
-        end
-      end
-    end
-
-    # Test that we only un-encode element itself.
-    assert_select "channel item" do
-      assert_select_encoded do
-        assert_select "p", 0
-      end
-    end
-  end
-
-  #
-  # Test assert_select_email
-  #
-
-  def test_assert_select_email
-    assert_raise(Assertion) { assert_select_email {} }
-    AssertSelectMailer.test("<div><p>foo</p><p>bar</p></div>").deliver
-    assert_select_email do
-      assert_select "div:root" do
-        assert_select "p:first-child", "foo"
-        assert_select "p:last-child", "bar"
-      end
-    end
-  end
-
-  def test_assert_select_email_multipart
-    AssertMultipartSelectMailer.test(:html => "<div><p>foo</p><p>bar</p></div>", :text => 'foo bar').deliver
-    assert_select_email do
-      assert_select "div:root" do
-        assert_select "p:first-child", "foo"
-        assert_select "p:last-child", "bar"
-      end
-    end
-  end
-
-  protected
-    def render_html(html)
-      @controller.response_with = html
-      get :html
-    end
-
-    def render_xml(xml)
-      @controller.response_with = xml
-      get :xml
-    end
-end
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 214eab2f0d..f509426040 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -1,6 +1,5 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
-require 'action_view/vendor/html-scanner'
 
 class SessionTest < ActiveSupport::TestCase
   StubApp = lambda { |env|
@@ -292,7 +291,7 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
       assert_equal({}, cookies.to_hash)
       assert_equal "OK", body
       assert_equal "OK", response.body
-      assert_kind_of HTML::Document, html_document
+      assert_kind_of Loofah::HTML::Document, html_document
       assert_equal 1, request_count
     end
   end
@@ -308,7 +307,7 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
       assert_equal({}, cookies.to_hash)
       assert_equal "Created", body
       assert_equal "Created", response.body
-      assert_kind_of HTML::Document, html_document
+      assert_kind_of Loofah::HTML::Document, html_document
       assert_equal 1, request_count
     end
   end
@@ -368,7 +367,7 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
       assert_response :redirect
       assert_response :found
       assert_equal "<html><body>You are being <a href=\"http://www.example.com/get\">redirected</a>.</body></html>", response.body
-      assert_kind_of HTML::Document, html_document
+      assert_kind_of Loofah::HTML::Document, html_document
       assert_equal 1, request_count
 
       follow_redirect!
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 2a5aad9c0e..05ad8b6cdc 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -389,7 +389,8 @@ class RequestForgeryProtectionControllerUsingResetSessionTest < ActionController
     SecureRandom.stubs(:base64).returns(@token + '<=?')
     get :meta
     assert_select 'meta[name=?][content=?]', 'csrf-param', 'custom_authenticity_token'
-    assert_select 'meta[name=?][content=?]', 'csrf-token', 'cf50faa3fe97702ca1ae&lt;=?'
+    assert_select 'meta[name=?]', 'csrf-token'
+    assert_match(/cf50faa3fe97702ca1ae&lt;=\?/, @response.body)
   end
 end
 
diff --git a/actionpack/test/controller/selector_test.rb b/actionpack/test/controller/selector_test.rb
deleted file mode 100644
index 1e80c8601c..0000000000
--- a/actionpack/test/controller/selector_test.rb
+++ /dev/null
@@ -1,629 +0,0 @@
-#--
-# Copyright (c) 2006 Assaf Arkin (http://labnotes.org)
-# Under MIT and/or CC By license.
-#++
-
-require 'abstract_unit'
-require 'controller/fake_controllers'
-require 'action_view/vendor/html-scanner'
-
-class SelectorTest < ActiveSupport::TestCase
-  #
-  # Basic selector: element, id, class, attributes.
-  #
-
-  def test_element
-    parse(%Q{<div id="1"></div><p></p><div id="2"></div>})
-    # Match element by name.
-    select("div")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "2", @matches[1].attributes["id"]
-    # Not case sensitive.
-    select("DIV")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "2", @matches[1].attributes["id"]
-    # Universal match (all elements).
-    select("*")
-    assert_equal 3, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal nil, @matches[1].attributes["id"]
-    assert_equal "2", @matches[2].attributes["id"]
-  end
-
-
-  def test_identifier
-    parse(%Q{<div id="1"></div><p></p><div id="2"></div>})
-    # Match element by ID.
-    select("div#1")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    # Match element by ID, substitute value.
-    select("div#?", 2)
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    # Element name does not match ID.
-    select("p#?", 2)
-    assert_equal 0, @matches.size
-    # Use regular expression.
-    select("#?", /\d/)
-    assert_equal 2, @matches.size
-  end
-
-
-  def test_class_name
-    parse(%Q{<div id="1" class=" foo "></div><p id="2" class=" foo bar "></p><div id="3" class="bar"></div>})
-    # Match element with specified class.
-    select("div.foo")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    # Match any element with specified class.
-    select("*.foo")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "2", @matches[1].attributes["id"]
-    # Match elements with other class.
-    select("*.bar")
-    assert_equal 2, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    # Match only element with both class names.
-    select("*.bar.foo")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-  end
-
-
-  def test_attribute
-    parse(%Q{<div id="1"></div><p id="2" title="" bar="foo"></p><div id="3" title="foo"></div>})
-    # Match element with attribute.
-    select("div[title]")
-    assert_equal 1, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-    # Match any element with attribute.
-    select("*[title]")
-    assert_equal 2, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    # Match element with attribute value.
-    select("*[title=foo]")
-    assert_equal 1, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-    # Match element with attribute and attribute value.
-    select("[bar=foo][title]")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    # Not case sensitive.
-    select("[BAR=foo][TiTle]")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-  end
-
-
-  def test_attribute_quoted
-    parse(%Q{<div id="1" title="foo"></div><div id="2" title="bar"></div><div id="3" title="  bar  "></div>})
-    # Match without quotes.
-    select("[title = bar]")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    # Match with single quotes.
-    select("[title = 'bar' ]")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    # Match with double quotes.
-    select("[title = \"bar\" ]")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    # Match with spaces.
-    select("[title = \"  bar  \" ]")
-    assert_equal 1, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-  end
-
-
-  def test_attribute_equality
-    parse(%Q{<div id="1" title="foo bar"></div><div id="2" title="barbaz"></div>})
-    # Match (fail) complete value.
-    select("[title=bar]")
-    assert_equal 0, @matches.size
-    # Match space-separate word.
-    select("[title~=foo]")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    select("[title~=bar]")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    # Match beginning of value.
-    select("[title^=ba]")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    # Match end of value.
-    select("[title$=ar]")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    # Match text in value.
-    select("[title*=bar]")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "2", @matches[1].attributes["id"]
-    # Match first space separated word.
-    select("[title|=foo]")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    select("[title|=bar]")
-    assert_equal 0, @matches.size
-  end
-
-
-  #
-  # Selector composition: groups, sibling, children
-  #
-
-
-  def test_selector_group
-    parse(%Q{<h1 id="1"></h1><h2 id="2"></h2><h3 id="3"></h3>})
-    # Simple group selector.
-    select("h1,h3")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    select("h1 , h3")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    # Complex group selector.
-    parse(%Q{<h1 id="1"><a href="foo"></a></h1><h2 id="2"><a href="bar"></a></h2><h3 id="2"><a href="baz"></a></h3>})
-    select("h1 a, h3 a")
-    assert_equal 2, @matches.size
-    assert_equal "foo", @matches[0].attributes["href"]
-    assert_equal "baz", @matches[1].attributes["href"]
-    # And now for the three selector challenge.
-    parse(%Q{<h1 id="1"><a href="foo"></a></h1><h2 id="2"><a href="bar"></a></h2><h3 id="2"><a href="baz"></a></h3>})
-    select("h1 a, h2 a, h3 a")
-    assert_equal 3, @matches.size
-    assert_equal "foo", @matches[0].attributes["href"]
-    assert_equal "bar", @matches[1].attributes["href"]
-    assert_equal "baz", @matches[2].attributes["href"]
-  end
-
-
-  def test_sibling_selector
-    parse(%Q{<h1 id="1"></h1><h2 id="2"></h2><h3 id="3"></h3>})
-    # Test next sibling.
-    select("h1+*")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    select("h1+h2")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    select("h1+h3")
-    assert_equal 0, @matches.size
-    select("*+h3")
-    assert_equal 1, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-    # Test any sibling.
-    select("h1~*")
-    assert_equal 2, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    select("h2~*")
-    assert_equal 1, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-  end
-
-
-  def test_children_selector
-    parse(%Q{<div><p id="1"><span id="2"></span></p></div><div><p id="3"><span id="4" class="foo"></span></p></div>})
-    # Test child selector.
-    select("div>p")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    select("div>span")
-    assert_equal 0, @matches.size
-    select("div>p#3")
-    assert_equal 1, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-    select("div>p>span")
-    assert_equal 2, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    assert_equal "4", @matches[1].attributes["id"]
-    # Test descendant selector.
-    select("div p")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    select("div span")
-    assert_equal 2, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    assert_equal "4", @matches[1].attributes["id"]
-    select("div *#3")
-    assert_equal 1, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-    select("div *#4")
-    assert_equal 1, @matches.size
-    assert_equal "4", @matches[0].attributes["id"]
-    # This is here because it failed before when whitespaces
-    # were not properly stripped.
-    select("div .foo")
-    assert_equal 1, @matches.size
-    assert_equal "4", @matches[0].attributes["id"]
-  end
-
-
-  #
-  # Pseudo selectors: root, nth-child, empty, content, etc
-  #
-
-
-  def test_root_selector
-    parse(%Q{<div id="1"><div id="2"></div></div>})
-    # Can only find element if it's root.
-    select(":root")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    select("#1:root")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    select("#2:root")
-    assert_equal 0, @matches.size
-    # Opposite for nth-child.
-    select("#1:nth-child(1)")
-    assert_equal 0, @matches.size
-  end
-
-
-  def test_nth_child_odd_even
-    parse(%Q{<table><tr id="1"></tr><tr id="2"></tr><tr id="3"></tr><tr id="4"></tr></table>})
-    # Test odd nth children.
-    select("tr:nth-child(odd)")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    # Test even nth children.
-    select("tr:nth-child(even)")
-    assert_equal 2, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    assert_equal "4", @matches[1].attributes["id"]
-  end
-
-
-  def test_nth_child_a_is_zero
-    parse(%Q{<table><tr id="1"></tr><tr id="2"></tr><tr id="3"></tr><tr id="4"></tr></table>})
-    # Test the third child.
-    select("tr:nth-child(0n+3)")
-    assert_equal 1, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-    # Same but an can be omitted when zero.
-    select("tr:nth-child(3)")
-    assert_equal 1, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-    # Second element (but not every second element).
-    select("tr:nth-child(0n+2)")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    # Before first and past last returns nothing.:
-    assert_raise(ArgumentError) { select("tr:nth-child(-1)") }
-    select("tr:nth-child(0)")
-    assert_equal 0, @matches.size
-    select("tr:nth-child(5)")
-    assert_equal 0, @matches.size
-  end
-
-
-  def test_nth_child_a_is_one
-    parse(%Q{<table><tr id="1"></tr><tr id="2"></tr><tr id="3"></tr><tr id="4"></tr></table>})
-    # a is group of one, pick every element in group.
-    select("tr:nth-child(1n+0)")
-    assert_equal 4, @matches.size
-    # Same but a can be omitted when one.
-    select("tr:nth-child(n+0)")
-    assert_equal 4, @matches.size
-    # Same but b can be omitted when zero.
-    select("tr:nth-child(n)")
-    assert_equal 4, @matches.size
-  end
-
-
-  def test_nth_child_b_is_zero
-    parse(%Q{<table><tr id="1"></tr><tr id="2"></tr><tr id="3"></tr><tr id="4"></tr></table>})
-    # If b is zero, pick the n-th element (here each one).
-    select("tr:nth-child(n+0)")
-    assert_equal 4, @matches.size
-    # If b is zero, pick the n-th element (here every second).
-    select("tr:nth-child(2n+0)")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    # If a and b are both zero, no element selected.
-    select("tr:nth-child(0n+0)")
-    assert_equal 0, @matches.size
-    select("tr:nth-child(0)")
-    assert_equal 0, @matches.size
-  end
-
-
-  def test_nth_child_a_is_negative
-    parse(%Q{<table><tr id="1"></tr><tr id="2"></tr><tr id="3"></tr><tr id="4"></tr></table>})
-    # Since a is -1, picks the first three elements.
-    select("tr:nth-child(-n+3)")
-    assert_equal 3, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "2", @matches[1].attributes["id"]
-    assert_equal "3", @matches[2].attributes["id"]
-    # Since a is -2, picks the first in every second of first four elements.
-    select("tr:nth-child(-2n+3)")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    # Since a is -2, picks the first in every second of first three elements.
-    select("tr:nth-child(-2n+2)")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-  end
-
-
-  def test_nth_child_b_is_negative
-    parse(%Q{<table><tr id="1"></tr><tr id="2"></tr><tr id="3"></tr><tr id="4"></tr></table>})
-    # Select last of four.
-    select("tr:nth-child(4n-1)")
-    assert_equal 1, @matches.size
-    assert_equal "4", @matches[0].attributes["id"]
-    # Select first of four.
-    select("tr:nth-child(4n-4)")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    # Select last of every second.
-    select("tr:nth-child(2n-1)")
-    assert_equal 2, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    assert_equal "4", @matches[1].attributes["id"]
-    # Select nothing since an+b always < 0
-    select("tr:nth-child(-1n-1)")
-    assert_equal 0, @matches.size
-  end
-
-
-  def test_nth_child_substitution_values
-    parse(%Q{<table><tr id="1"></tr><tr id="2"></tr><tr id="3"></tr><tr id="4"></tr></table>})
-    # Test with ?n?.
-    select("tr:nth-child(?n?)", 2, 1)
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "3", @matches[1].attributes["id"]
-    select("tr:nth-child(?n?)", 2, 2)
-    assert_equal 2, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    assert_equal "4", @matches[1].attributes["id"]
-    select("tr:nth-child(?n?)", 4, 2)
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    # Test with ? (b only).
-    select("tr:nth-child(?)", 3)
-    assert_equal 1, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-    select("tr:nth-child(?)", 5)
-    assert_equal 0, @matches.size
-  end
-
-
-  def test_nth_last_child
-    parse(%Q{<table><tr id="1"></tr><tr id="2"></tr><tr id="3"></tr><tr id="4"></tr></table>})
-    # Last two elements.
-    select("tr:nth-last-child(-n+2)")
-    assert_equal 2, @matches.size
-    assert_equal "3", @matches[0].attributes["id"]
-    assert_equal "4", @matches[1].attributes["id"]
-    # All old elements counting from last one.
-    select("tr:nth-last-child(odd)")
-    assert_equal 2, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    assert_equal "4", @matches[1].attributes["id"]
-  end
-
-
-  def test_nth_of_type
-    parse(%Q{<table><thead></thead><tr id="1"></tr><tr id="2"></tr><tr id="3"></tr><tr id="4"></tr></table>})
-    # First two elements.
-    select("tr:nth-of-type(-n+2)")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "2", @matches[1].attributes["id"]
-    # All old elements counting from last one.
-    select("tr:nth-last-of-type(odd)")
-    assert_equal 2, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    assert_equal "4", @matches[1].attributes["id"]
-  end
-
-
-  def test_first_and_last
-    parse(%Q{<table><thead></thead><tr id="1"></tr><tr id="2"></tr><tr id="3"></tr><tr id="4"></tr></table>})
-    # First child.
-    select("tr:first-child")
-    assert_equal 0, @matches.size
-    select(":first-child")
-    assert_equal 1, @matches.size
-    assert_equal "thead", @matches[0].name
-    # First of type.
-    select("tr:first-of-type")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    select("thead:first-of-type")
-    assert_equal 1, @matches.size
-    assert_equal "thead", @matches[0].name
-    select("div:first-of-type")
-    assert_equal 0, @matches.size
-    # Last child.
-    select("tr:last-child")
-    assert_equal 1, @matches.size
-    assert_equal "4", @matches[0].attributes["id"]
-    # Last of type.
-    select("tr:last-of-type")
-    assert_equal 1, @matches.size
-    assert_equal "4", @matches[0].attributes["id"]
-    select("thead:last-of-type")
-    assert_equal 1, @matches.size
-    assert_equal "thead", @matches[0].name
-    select("div:last-of-type")
-    assert_equal 0, @matches.size
-  end
-
-
-  def test_only_child_and_only_type_first_and_last
-    # Only child.
-    parse(%Q{<table><tr></tr></table>})
-    select("table:only-child")
-    assert_equal 0, @matches.size
-    select("tr:only-child")
-    assert_equal 1, @matches.size
-    assert_equal "tr", @matches[0].name
-    parse(%Q{<table><tr></tr><tr></tr></table>})
-    select("tr:only-child")
-    assert_equal 0, @matches.size
-    # Only of type.
-    parse(%Q{<table><thead></thead><tr></tr><tr></tr></table>})
-    select("thead:only-of-type")
-    assert_equal 1, @matches.size
-    assert_equal "thead", @matches[0].name
-    select("td:only-of-type")
-    assert_equal 0, @matches.size
-  end
-
-
-  def test_empty
-    parse(%Q{<table><tr></tr></table>})
-    select("table:empty")
-    assert_equal 0, @matches.size
-    select("tr:empty")
-    assert_equal 1, @matches.size
-    parse(%Q{<div> </div>})
-    select("div:empty")
-    assert_equal 1, @matches.size
-  end
-
-
-  def test_content
-    parse(%Q{<div> </div>})
-    select("div:content()")
-    assert_equal 1, @matches.size
-    parse(%Q{<div>something </div>})
-    select("div:content()")
-    assert_equal 0, @matches.size
-    select("div:content(something)")
-    assert_equal 1, @matches.size
-    select("div:content( 'something' )")
-    assert_equal 1, @matches.size
-    select("div:content( \"something\" )")
-    assert_equal 1, @matches.size
-    select("div:content(?)", "something")
-    assert_equal 1, @matches.size
-    select("div:content(?)", /something/)
-    assert_equal 1, @matches.size
-  end
-
-
-  #
-  # Test negation.
-  #
-
-
-  def test_element_negation
-    parse(%Q{<p></p><div></div>})
-    select("*")
-    assert_equal 2, @matches.size
-    select("*:not(p)")
-    assert_equal 1, @matches.size
-    assert_equal "div", @matches[0].name
-    select("*:not(div)")
-    assert_equal 1, @matches.size
-    assert_equal "p", @matches[0].name
-    select("*:not(span)")
-    assert_equal 2, @matches.size
-  end
-
-
-  def test_id_negation
-    parse(%Q{<p id="1"></p><p id="2"></p>})
-    select("p")
-    assert_equal 2, @matches.size
-    select(":not(#1)")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    select(":not(#2)")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-  end
-
-
-  def test_class_name_negation
-    parse(%Q{<p class="foo"></p><p class="bar"></p>})
-    select("p")
-    assert_equal 2, @matches.size
-    select(":not(.foo)")
-    assert_equal 1, @matches.size
-    assert_equal "bar", @matches[0].attributes["class"]
-    select(":not(.bar)")
-    assert_equal 1, @matches.size
-    assert_equal "foo", @matches[0].attributes["class"]
-  end
-
-
-  def test_attribute_negation
-    parse(%Q{<p title="foo"></p><p title="bar"></p>})
-    select("p")
-    assert_equal 2, @matches.size
-    select(":not([title=foo])")
-    assert_equal 1, @matches.size
-    assert_equal "bar", @matches[0].attributes["title"]
-    select(":not([title=bar])")
-    assert_equal 1, @matches.size
-    assert_equal "foo", @matches[0].attributes["title"]
-  end
-
-
-  def test_pseudo_class_negation
-    parse(%Q{<div><p id="1"></p><p id="2"></p></div>})
-    select("p")
-    assert_equal 2, @matches.size
-    select("p:not(:first-child)")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-    select("p:not(:nth-child(2))")
-    assert_equal 1, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-  end
-
-
-  def test_negation_details
-    parse(%Q{<p id="1"></p><p id="2"></p><p id="3"></p>})
-    assert_raise(ArgumentError) { select(":not(") }
-    assert_raise(ArgumentError) { select(":not(:not())") }
-    select("p:not(#1):not(#3)")
-    assert_equal 1, @matches.size
-    assert_equal "2", @matches[0].attributes["id"]
-  end
-
-
-  def test_select_from_element
-    parse(%Q{<div><p id="1"></p><p id="2"></p></div>})
-    select("div")
-    @matches = @matches[0].select("p")
-    assert_equal 2, @matches.size
-    assert_equal "1", @matches[0].attributes["id"]
-    assert_equal "2", @matches[1].attributes["id"]
-  end
-
-
-protected
-
-  def parse(html)
-    @html = HTML::Document.new(html).root
-  end
-
-  def select(*selector)
-    @matches = HTML.selector(*selector).select(@html)
-  end
-
-end
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 3b3b15c061..8bf850a200 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -353,168 +353,6 @@ XML
     assert_equal "bar", assigns[:bar]
   end
 
-  def test_assert_tag_tag
-    process :test_html_output
-
-    # there is a 'form' tag
-    assert_tag :tag => 'form'
-    # there is not an 'hr' tag
-    assert_no_tag :tag => 'hr'
-  end
-
-  def test_assert_tag_attributes
-    process :test_html_output
-
-    # there is a tag with an 'id' of 'bar'
-    assert_tag :attributes => { :id => "bar" }
-    # there is no tag with a 'name' of 'baz'
-    assert_no_tag :attributes => { :name => "baz" }
-  end
-
-  def test_assert_tag_parent
-    process :test_html_output
-
-    # there is a tag with a parent 'form' tag
-    assert_tag :parent => { :tag => "form" }
-    # there is no tag with a parent of 'input'
-    assert_no_tag :parent => { :tag => "input" }
-  end
-
-  def test_assert_tag_child
-    process :test_html_output
-
-    # there is a tag with a child 'input' tag
-    assert_tag :child => { :tag => "input" }
-    # there is no tag with a child 'strong' tag
-    assert_no_tag :child => { :tag => "strong" }
-  end
-
-  def test_assert_tag_ancestor
-    process :test_html_output
-
-    # there is a 'li' tag with an ancestor having an id of 'foo'
-    assert_tag :ancestor => { :attributes => { :id => "foo" } }, :tag => "li"
-    # there is no tag of any kind with an ancestor having an href matching 'foo'
-    assert_no_tag :ancestor => { :attributes => { :href => /foo/ } }
-  end
-
-  def test_assert_tag_descendant
-    process :test_html_output
-
-    # there is a tag with a descendant 'li' tag
-    assert_tag :descendant => { :tag => "li" }
-    # there is no tag with a descendant 'html' tag
-    assert_no_tag :descendant => { :tag => "html" }
-  end
-
-  def test_assert_tag_sibling
-    process :test_html_output
-
-    # there is a tag with a sibling of class 'item'
-    assert_tag :sibling => { :attributes => { :class => "item" } }
-    # there is no tag with a sibling 'ul' tag
-    assert_no_tag :sibling => { :tag => "ul" }
-  end
-
-  def test_assert_tag_after
-    process :test_html_output
-
-    # there is a tag following a sibling 'div' tag
-    assert_tag :after => { :tag => "div" }
-    # there is no tag following a sibling tag with id 'bar'
-    assert_no_tag :after => { :attributes => { :id => "bar" } }
-  end
-
-  def test_assert_tag_before
-    process :test_html_output
-
-    # there is a tag preceding a tag with id 'bar'
-    assert_tag :before => { :attributes => { :id => "bar" } }
-    # there is no tag preceding a 'form' tag
-    assert_no_tag :before => { :tag => "form" }
-  end
-
-  def test_assert_tag_children_count
-    process :test_html_output
-
-    # there is a tag with 2 children
-    assert_tag :children => { :count => 2 }
-    # in particular, there is a <ul> tag with two children (a nameless pair of <li>s)
-    assert_tag :tag => 'ul', :children => { :count => 2 }
-    # there is no tag with 4 children
-    assert_no_tag :children => { :count => 4 }
-  end
-
-  def test_assert_tag_children_less_than
-    process :test_html_output
-
-    # there is a tag with less than 5 children
-    assert_tag :children => { :less_than => 5 }
-    # there is no 'ul' tag with less than 2 children
-    assert_no_tag :children => { :less_than => 2 }, :tag => "ul"
-  end
-
-  def test_assert_tag_children_greater_than
-    process :test_html_output
-
-    # there is a 'body' tag with more than 1 children
-    assert_tag :children => { :greater_than => 1 }, :tag => "body"
-    # there is no tag with more than 10 children
-    assert_no_tag :children => { :greater_than => 10 }
-  end
-
-  def test_assert_tag_children_only
-    process :test_html_output
-
-    # there is a tag containing only one child with an id of 'foo'
-    assert_tag :children => { :count => 1,
-                              :only => { :attributes => { :id => "foo" } } }
-    # there is no tag containing only one 'li' child
-    assert_no_tag :children => { :count => 1, :only => { :tag => "li" } }
-  end
-
-  def test_assert_tag_content
-    process :test_html_output
-
-    # the output contains the string "Name"
-    assert_tag :content => /Name/
-    # the output does not contain the string "test"
-    assert_no_tag :content => /test/
-  end
-
-  def test_assert_tag_multiple
-    process :test_html_output
-
-    # there is a 'div', id='bar', with an immediate child whose 'action'
-    # attribute matches the regexp /somewhere/.
-    assert_tag :tag => "div", :attributes => { :id => "bar" },
-               :child => { :attributes => { :action => /somewhere/ } }
-
-    # there is no 'div', id='foo', with a 'ul' child with more than
-    # 2 "li" children.
-    assert_no_tag :tag => "div", :attributes => { :id => "foo" },
-                  :child => {
-                    :tag => "ul",
-                    :children => { :greater_than => 2,
-                                   :only => { :tag => "li" } } }
-  end
-
-  def test_assert_tag_children_without_content
-    process :test_html_output
-
-    # there is a form tag with an 'input' child which is a self closing tag
-    assert_tag :tag => "form",
-      :children => { :count => 1,
-        :only => { :tag => "input" } }
-
-    # the body tag has an 'a' child which in turn has an 'img' child
-    assert_tag :tag => "body",
-      :children => { :count => 1,
-        :only => { :tag => "a",
-          :children => { :count => 1,
-            :only => { :tag => "img" } } } }
-  end
-
   def test_should_not_impose_childless_html_tags_in_xml
     process :test_xml_output
 
@@ -529,23 +367,6 @@ XML
     assert err.empty?
   end
 
-  def test_assert_tag_attribute_matching
-    @response.body = '<input type="text" name="my_name">'
-    assert_tag :tag => 'input',
-                 :attributes => { :name => /my/, :type => 'text' }
-    assert_no_tag :tag => 'input',
-                 :attributes => { :name => 'my', :type => 'text' }
-    assert_no_tag :tag => 'input',
-                 :attributes => { :name => /^my$/, :type => 'text' }
-  end
-
-  def test_assert_tag_content_matching
-    @response.body = "<p>hello world</p>"
-    assert_tag :tag => "p", :content => "hello world"
-    assert_tag :tag => "p", :content => /hello/
-    assert_no_tag :tag => "p", :content => "hello"
-  end
-
   def test_assert_generates
     assert_generates 'controller/action/5', :controller => 'controller', :action => 'action', :id => '5'
     assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action"}