Move generic assertions into ActionDispatch

6 files changed, 0 insertions, 1107 deletions

diff --git a/actionpack/lib/action_controller/testing/assertions/dom.rb b/actionpack/lib/action_controller/testing/assertions/dom.rb
deleted file mode 100644
index c0e6c68fcd..0000000000
--- a/actionpack/lib/action_controller/testing/assertions/dom.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-module ActionController
-  module Assertions
-    module DomAssertions
-      # Test two HTML strings for equivalency (e.g., identical up to reordering of attributes)
-      #
-      # ==== Examples
-      #
-      #   # assert that the referenced method generates the appropriate HTML string
-      #   assert_dom_equal '<a href="http://www.example.com">Apples</a>', link_to("Apples", "http://www.example.com")
-      #
-      def assert_dom_equal(expected, actual, message = "")
-        expected_dom = HTML::Document.new(expected).root
-        actual_dom   = HTML::Document.new(actual).root
-        full_message = build_message(message, "<?> expected to be == to\n<?>.", expected_dom.to_s, actual_dom.to_s)
-
-        assert_block(full_message) { expected_dom == actual_dom }
-      end
-      
-      # The negated form of +assert_dom_equivalent+.
-      #
-      # ==== Examples
-      #
-      #   # assert that the referenced method does not generate the specified HTML string
-      #   assert_dom_not_equal '<a href="http://www.example.com">Apples</a>', link_to("Oranges", "http://www.example.com")
-      #
-      def assert_dom_not_equal(expected, actual, message = "")
-        expected_dom = HTML::Document.new(expected).root
-        actual_dom   = HTML::Document.new(actual).root
-        full_message = build_message(message, "<?> expected to be != to\n<?>.", expected_dom.to_s, actual_dom.to_s)
-
-        assert_block(full_message) { expected_dom != actual_dom }
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/testing/assertions/model.rb b/actionpack/lib/action_controller/testing/assertions/model.rb
deleted file mode 100644
index 93e3bcf456..0000000000
--- a/actionpack/lib/action_controller/testing/assertions/model.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module ActionController
-  module Assertions
-    module ModelAssertions
-      # Ensures that the passed record is valid by Active Record standards and
-      # returns any error messages if it is not.
-      #
-      # ==== Examples
-      #
-      #   # assert that a newly created record is valid
-      #   model = Model.new
-      #   assert_valid(model)
-      #
-      def assert_valid(record)
-        ::ActiveSupport::Deprecation.warn("assert_valid is deprecated. Use assert record.valid? instead", caller)
-        assert record.valid?, record.errors.full_messages.join("\n")
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/testing/assertions/response.rb b/actionpack/lib/action_controller/testing/assertions/response.rb
deleted file mode 100644
index 7b2936e26c..0000000000
--- a/actionpack/lib/action_controller/testing/assertions/response.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-module ActionController
-  module Assertions
-    # A small suite of assertions that test responses from Rails applications.
-    module ResponseAssertions
-      # Asserts that the response is one of the following types:
-      #
-      # * <tt>:success</tt>   - Status code was 200
-      # * <tt>:redirect</tt>  - Status code was in the 300-399 range
-      # * <tt>:missing</tt>   - Status code was 404
-      # * <tt>:error</tt>     - Status code was in the 500-599 range
-      #
-      # You can also pass an explicit status number like assert_response(501)
-      # or its symbolic equivalent assert_response(:not_implemented).
-      # See ActionDispatch::StatusCodes for a full list.
-      #
-      # ==== Examples
-      #
-      #   # assert that the response was a redirection
-      #   assert_response :redirect
-      #
-      #   # assert that the response code was status code 401 (unauthorized)
-      #   assert_response 401
-      #
-      def assert_response(type, message = nil)
-        validate_request!
-
-        if [ :success, :missing, :redirect, :error ].include?(type) && @response.send("#{type}?")
-          assert_block("") { true } # to count the assertion
-        elsif type.is_a?(Fixnum) && @response.response_code == type
-          assert_block("") { true } # to count the assertion
-        elsif type.is_a?(Symbol) && @response.response_code == ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE[type]
-          assert_block("") { true } # to count the assertion
-        else
-          if @controller && @response.error?
-            exception = @controller.template.instance_variable_get(:@exception)
-            exception_message = exception && exception.message
-            assert_block(build_message(message, "Expected response to be a <?>, but was <?>\n<?>", type, @response.response_code, exception_message.to_s)) { false }
-          else
-            assert_block(build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code)) { false }
-          end
-        end
-      end
-
-      # Assert that the redirection options passed in match those of the redirect called in the latest action.
-      # This match can be partial, such that assert_redirected_to(:controller => "weblog") will also
-      # match the redirection of redirect_to(:controller => "weblog", :action => "show") and so on.
-      #
-      # ==== Examples
-      #
-      #   # assert that the redirection was to the "index" action on the WeblogController
-      #   assert_redirected_to :controller => "weblog", :action => "index"
-      #
-      #   # assert that the redirection was to the named route login_url
-      #   assert_redirected_to login_url
-      #
-      #   # assert that the redirection was to the url for @customer
-      #   assert_redirected_to @customer
-      #
-      def assert_redirected_to(options = {}, message=nil)
-        validate_request!
-
-        assert_response(:redirect, message)
-        return true if options == @response.redirected_to
-
-        # Support partial arguments for hash redirections
-        if options.is_a?(Hash) && @response.redirected_to.is_a?(Hash)
-          return true if options.all? {|(key, value)| @response.redirected_to[key] == value}
-        end
-
-        redirected_to_after_normalisation = normalize_argument_to_redirection(@response.redirected_to)
-        options_after_normalisation       = normalize_argument_to_redirection(options)
-
-        if redirected_to_after_normalisation != options_after_normalisation
-          flunk "Expected response to be a redirect to <#{options_after_normalisation}> but was a redirect to <#{redirected_to_after_normalisation}>"
-        end
-      end
-
-      # Asserts that the request was rendered with the appropriate template file or partials
-      #
-      # ==== Examples
-      #
-      #   # assert that the "new" view template was rendered
-      #   assert_template "new"
-      #
-      #   # assert that the "_customer" partial was rendered twice
-      #   assert_template :partial => '_customer', :count => 2
-      #
-      #   # assert that no partials were rendered
-      #   assert_template :partial => false
-      #
-      def assert_template(options = {}, message = nil)
-        validate_request!
-
-        case options
-         when NilClass, String
-          rendered = (@controller.template.rendered[:template] || []).map { |t| t.identifier }
-          msg = build_message(message,
-                  "expecting <?> but rendering with <?>",
-                  options, rendered.join(', '))
-          assert_block(msg) do
-            if options.nil?
-              @controller.template.rendered[:template].blank?
-            else
-              rendered.any? { |t| t.match(options) }
-            end
-          end
-        when Hash
-          if expected_partial = options[:partial]
-            partials = @controller.template.rendered[:partials]
-            if expected_count = options[:count]
-              found = partials.detect { |p, _| p.identifier.match(expected_partial) }
-              actual_count = found.nil? ? 0 : found.second
-              msg = build_message(message,
-                      "expecting ? to be rendered ? time(s) but rendered ? time(s)",
-                       expected_partial, expected_count, actual_count)
-              assert(actual_count == expected_count.to_i, msg)
-            else
-              msg = build_message(message,
-                      "expecting partial <?> but action rendered <?>",
-                      options[:partial], partials.keys)
-              assert(partials.keys.any? { |p| p.identifier.match(expected_partial) }, msg)
-            end
-          else
-            assert @controller.template.rendered[:partials].empty?,
-              "Expected no partials to be rendered"
-          end
-        end
-      end
-
-      private
-        # Proxy to to_param if the object will respond to it.
-        def parameterize(value)
-          value.respond_to?(:to_param) ? value.to_param : value
-        end
-
-        def normalize_argument_to_redirection(fragment)
-          after_routing = @controller.url_for(fragment)
-          if after_routing =~ %r{^\w+://.*}
-            after_routing
-          else
-            # FIXME - this should probably get removed.
-            if after_routing.first != '/'
-              after_routing = '/' + after_routing
-            end
-            @request.protocol + @request.host_with_port + after_routing
-          end
-        end
-
-        def validate_request!
-          unless @request.is_a?(ActionDispatch::Request)
-            raise ArgumentError, "@request must be an ActionDispatch::Request"
-          end
-        end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/testing/assertions/routing.rb b/actionpack/lib/action_controller/testing/assertions/routing.rb
deleted file mode 100644
index f3f4f54fe3..0000000000
--- a/actionpack/lib/action_controller/testing/assertions/routing.rb
+++ /dev/null
@@ -1,142 +0,0 @@
-module ActionController
-  module Assertions
-    # Suite of assertions to test routes generated by Rails and the handling of requests made to them.
-    module RoutingAssertions
-      # Asserts that the routing of the given +path+ was handled correctly and that the parsed options (given in the +expected_options+ hash)
-      # match +path+.  Basically, it asserts that Rails recognizes the route given by +expected_options+.
-      #
-      # Pass a hash in the second argument (+path+) to specify the request method.  This is useful for routes
-      # requiring a specific HTTP method.  The hash should contain a :path with the incoming request path
-      # and a :method containing the required HTTP verb.
-      #
-      #   # assert that POSTing to /items will call the create action on ItemsController
-      #   assert_recognizes {:controller => 'items', :action => 'create'}, {:path => 'items', :method => :post}
-      #
-      # You can also pass in +extras+ with a hash containing URL parameters that would normally be in the query string.  This can be used
-      # to assert that values in the query string string will end up in the params hash correctly.  To test query strings you must use the
-      # extras argument, appending the query string on the path directly will not work.  For example:
-      #
-      #   # assert that a path of '/items/list/1?view=print' returns the correct options
-      #   assert_recognizes {:controller => 'items', :action => 'list', :id => '1', :view => 'print'}, 'items/list/1', { :view => "print" }
-      #
-      # The +message+ parameter allows you to pass in an error message that is displayed upon failure.
-      #
-      # ==== Examples
-      #   # Check the default route (i.e., the index action)
-      #   assert_recognizes {:controller => 'items', :action => 'index'}, 'items'
-      #
-      #   # Test a specific action
-      #   assert_recognizes {:controller => 'items', :action => 'list'}, 'items/list'
-      #
-      #   # Test an action with a parameter
-      #   assert_recognizes {:controller => 'items', :action => 'destroy', :id => '1'}, 'items/destroy/1'
-      #
-      #   # Test a custom route
-      #   assert_recognizes {:controller => 'items', :action => 'show', :id => '1'}, 'view/item1'
-      #
-      #   # Check a Simply RESTful generated route
-      #   assert_recognizes list_items_url, 'items/list'
-      def assert_recognizes(expected_options, path, extras={}, message=nil)
-        if path.is_a? Hash
-          request_method = path[:method]
-          path           = path[:path]
-        else
-          request_method = nil
-        end
-
-        ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
-        request = recognized_request_for(path, request_method)
-
-        expected_options = expected_options.clone
-        extras.each_key { |key| expected_options.delete key } unless extras.nil?
-
-        expected_options.stringify_keys!
-        routing_diff = expected_options.diff(request.path_parameters)
-        msg = build_message(message, "The recognized options <?> did not match <?>, difference: <?>",
-            request.path_parameters, expected_options, expected_options.diff(request.path_parameters))
-        assert_block(msg) { request.path_parameters == expected_options }
-      end
-
-      # Asserts that the provided options can be used to generate the provided path.  This is the inverse of +assert_recognizes+.
-      # The +extras+ parameter is used to tell the request the names and values of additional request parameters that would be in
-      # a query string. The +message+ parameter allows you to specify a custom error message for assertion failures.
-      #
-      # The +defaults+ parameter is unused.
-      #
-      # ==== Examples
-      #   # Asserts that the default action is generated for a route with no action
-      #   assert_generates "/items", :controller => "items", :action => "index"
-      #
-      #   # Tests that the list action is properly routed
-      #   assert_generates "/items/list", :controller => "items", :action => "list"
-      #
-      #   # Tests the generation of a route with a parameter
-      #   assert_generates "/items/list/1", { :controller => "items", :action => "list", :id => "1" }
-      #
-      #   # Asserts that the generated route gives us our custom route
-      #   assert_generates "changesets/12", { :controller => 'scm', :action => 'show_diff', :revision => "12" }
-      def assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)
-        expected_path = "/#{expected_path}" unless expected_path[0] == ?/
-        # Load routes.rb if it hasn't been loaded.
-        ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
-
-        generated_path, extra_keys = ActionController::Routing::Routes.generate_extras(options, defaults)
-        found_extras = options.reject {|k, v| ! extra_keys.include? k}
-
-        msg = build_message(message, "found extras <?>, not <?>", found_extras, extras)
-        assert_block(msg) { found_extras == extras }
-
-        msg = build_message(message, "The generated path <?> did not match <?>", generated_path,
-            expected_path)
-        assert_block(msg) { expected_path == generated_path }
-      end
-
-      # Asserts that path and options match both ways; in other words, it verifies that <tt>path</tt> generates
-      # <tt>options</tt> and then that <tt>options</tt> generates <tt>path</tt>.  This essentially combines +assert_recognizes+
-      # and +assert_generates+ into one step.
-      #
-      # The +extras+ hash allows you to specify options that would normally be provided as a query string to the action.  The
-      # +message+ parameter allows you to specify a custom error message to display upon failure.
-      #
-      # ==== Examples
-      #  # Assert a basic route: a controller with the default action (index)
-      #  assert_routing '/home', :controller => 'home', :action => 'index'
-      #
-      #  # Test a route generated with a specific controller, action, and parameter (id)
-      #  assert_routing '/entries/show/23', :controller => 'entries', :action => 'show', id => 23
-      #
-      #  # Assert a basic route (controller + default action), with an error message if it fails
-      #  assert_routing '/store', { :controller => 'store', :action => 'index' }, {}, {}, 'Route for store index not generated properly'
-      #
-      #  # Tests a route, providing a defaults hash
-      #  assert_routing 'controller/action/9', {:id => "9", :item => "square"}, {:controller => "controller", :action => "action"}, {}, {:item => "square"}
-      #
-      #  # Tests a route with a HTTP method
-      #  assert_routing { :method => 'put', :path => '/product/321' }, { :controller => "product", :action => "update", :id => "321" }
-      def assert_routing(path, options, defaults={}, extras={}, message=nil)
-        assert_recognizes(options, path, extras, message)
-
-        controller, default_controller = options[:controller], defaults[:controller]
-        if controller && controller.include?(?/) && default_controller && default_controller.include?(?/)
-          options[:controller] = "/#{controller}"
-        end
-
-        assert_generates(path.is_a?(Hash) ? path[:path] : path, options, defaults, extras, message)
-      end
-
-      private
-        # Recognizes the route for a given path.
-        def recognized_request_for(path, request_method = nil)
-          path = "/#{path}" unless path.first == '/'
-
-          # Assume given controller
-          request = ActionController::TestRequest.new
-          request.env["REQUEST_METHOD"] = request_method.to_s.upcase if request_method
-          request.path   = path
-
-          ActionController::Routing::Routes.recognize(request)
-          request
-        end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/testing/assertions/selector.rb b/actionpack/lib/action_controller/testing/assertions/selector.rb
deleted file mode 100644
index 0d56ea5ef7..0000000000
--- a/actionpack/lib/action_controller/testing/assertions/selector.rb
+++ /dev/null
@@ -1,632 +0,0 @@
-#--
-# Copyright (c) 2006 Assaf Arkin (http://labnotes.org)
-# Under MIT and/or CC By license.
-#++
-
-module ActionController
-  module Assertions
-    unless const_defined?(:NO_STRIP)
-      NO_STRIP = %w{pre script style textarea}
-    end
-
-    # Adds the +assert_select+ method for use in Rails functional
-    # test cases, which can be used to make assertions on the response HTML of a controller
-    # action. You can also call +assert_select+ within another +assert_select+ to
-    # make assertions on elements selected by the enclosing assertion.
-    #
-    # Use +css_select+ to select elements without making an assertions, either
-    # from the response HTML or elements selected by the enclosing assertion.
-    # 
-    # In addition to HTML responses, you can make the following assertions:
-    # * +assert_select_rjs+ - Assertions on HTML content of RJS update and insertion operations.
-    # * +assert_select_encoded+ - Assertions on HTML encoded inside XML, for example for dealing with feed item descriptions.
-    # * +assert_select_email+ - Assertions on the HTML body of an e-mail.
-    #
-    # Also see HTML::Selector to learn how to use selectors.
-    module SelectorAssertions
-      # :call-seq:
-      #   css_select(selector) => array
-      #   css_select(element, selector) => array
-      #
-      # Select and return all matching elements.
-      #
-      # If called with a single argument, uses that argument as a selector
-      # to match all elements of the current page. Returns an empty array
-      # if no match is found.
-      #
-      # If called with two arguments, uses the first argument as the base
-      # element and the second argument as the selector. Attempts to match the
-      # base element and any of its children. Returns an empty array if no
-      # match is found.
-      #
-      # The selector may be a CSS selector expression (String), an expression
-      # with substitution values (Array) or an HTML::Selector object.
-      #
-      # ==== Examples
-      #   # Selects all div tags
-      #   divs = css_select("div")
-      #
-      #   # Selects all paragraph tags and does something interesting
-      #   pars = css_select("p")
-      #   pars.each do |par|
-      #     # Do something fun with paragraphs here...
-      #   end
-      #
-      #   # Selects all list items in unordered lists
-      #   items = css_select("ul>li") 
-      #      
-      #   # Selects all form tags and then all inputs inside the form
-      #   forms = css_select("form")
-      #   forms.each do |form|
-      #     inputs = css_select(form, "input")
-      #     ...
-      #   end
-      #
-      def css_select(*args)
-        # See assert_select to understand what's going on here.
-        arg = args.shift
-
-        if arg.is_a?(HTML::Node)
-          root = arg
-          arg = args.shift
-        elsif arg == nil
-          raise ArgumentError, "First argument is either selector or element to select, but nil found. Perhaps you called assert_select with an element that does not exist?"
-        elsif @selected
-          matches = []
-
-          @selected.each do |selected|
-            subset = css_select(selected, HTML::Selector.new(arg.dup, args.dup))
-            subset.each do |match|
-              matches << match unless matches.any? { |m| m.equal?(match) }
-            end
-          end
-
-          return matches
-        else
-          root = response_from_page_or_rjs
-        end
-
-        case arg
-          when String
-            selector = HTML::Selector.new(arg, args)
-          when Array
-            selector = HTML::Selector.new(*arg)
-          when HTML::Selector
-            selector = arg
-          else raise ArgumentError, "Expecting a selector as the first argument"
-        end
-
-        selector.select(root)
-      end
-
-      # :call-seq:
-      #   assert_select(selector, equality?, message?)
-      #   assert_select(element, selector, equality?, message?)
-      #
-      # An assertion that selects elements and makes one or more equality tests.
-      #
-      # If the first argument is an element, selects all matching elements
-      # starting from (and including) that element and all its children in
-      # depth-first order.
-      #
-      # If no element if specified, calling +assert_select+ selects from the
-      # response HTML unless +assert_select+ is called from within an +assert_select+ block.
-      #
-      # When called with a block +assert_select+ passes an array of selected elements
-      # to the block. Calling +assert_select+ from the block, with no element specified,
-      # runs the assertion on the complete set of elements selected by the enclosing assertion.
-      # Alternatively the array may be iterated through so that +assert_select+ can be called
-      # separately for each element.
-      #
-      #
-      # ==== Example
-      # If the response contains two ordered lists, each with four list elements then:
-      #   assert_select "ol" do |elements|
-      #     elements.each do |element|
-      #       assert_select element, "li", 4
-      #     end
-      #   end
-      #
-      # will pass, as will:
-      #   assert_select "ol" do
-      #     assert_select "li", 8
-      #   end
-      #
-      # The selector may be a CSS selector expression (String), an expression
-      # with substitution values, or an HTML::Selector object.
-      #
-      # === Equality Tests
-      #
-      # The equality test may be one of the following:
-      # * <tt>true</tt> - Assertion is true if at least one element selected.
-      # * <tt>false</tt> - Assertion is true if no element selected.
-      # * <tt>String/Regexp</tt> - Assertion is true if the text value of at least
-      #   one element matches the string or regular expression.
-      # * <tt>Integer</tt> - Assertion is true if exactly that number of
-      #   elements are selected.
-      # * <tt>Range</tt> - Assertion is true if the number of selected
-      #   elements fit the range.
-      # If no equality test specified, the assertion is true if at least one
-      # element selected.
-      #
-      # To perform more than one equality tests, use a hash with the following keys:
-      # * <tt>:text</tt> - Narrow the selection to elements that have this text
-      #   value (string or regexp).
-      # * <tt>:html</tt> - Narrow the selection to elements that have this HTML
-      #   content (string or regexp).
-      # * <tt>:count</tt> - Assertion is true if the number of selected elements
-      #   is equal to this value.
-      # * <tt>:minimum</tt> - Assertion is true if the number of selected
-      #   elements is at least this value.
-      # * <tt>:maximum</tt> - Assertion is true if the number of selected
-      #   elements is at most this value.
-      #
-      # If the method is called with a block, once all equality tests are
-      # evaluated the block is called with an array of all matched elements.
-      #
-      # ==== Examples
-      #
-      #   # At least one form element
-      #   assert_select "form"
-      #
-      #   # Form element includes four input fields
-      #   assert_select "form input", 4
-      #
-      #   # Page title is "Welcome"
-      #   assert_select "title", "Welcome"
-      #
-      #   # Page title is "Welcome" and there is only one title element
-      #   assert_select "title", {:count=>1, :text=>"Welcome"},
-      #       "Wrong title or more than one title element"
-      #
-      #   # Page contains no forms
-      #   assert_select "form", false, "This page must contain no forms"
-      #
-      #   # Test the content and style
-      #   assert_select "body div.header ul.menu"
-      #
-      #   # Use substitution values
-      #   assert_select "ol>li#?", /item-\d+/
-      #
-      #   # All input fields in the form have a name
-      #   assert_select "form input" do
-      #     assert_select "[name=?]", /.+/  # Not empty
-      #   end
-      def assert_select(*args, &block)
-        # Start with optional element followed by mandatory selector.
-        arg = args.shift
-
-        if arg.is_a?(HTML::Node)
-          # First argument is a node (tag or text, but also HTML root),
-          # so we know what we're selecting from.
-          root = arg
-          arg = args.shift
-        elsif arg == nil
-          # This usually happens when passing a node/element that
-          # happens to be nil.
-          raise ArgumentError, "First argument is either selector or element to select, but nil found. Perhaps you called assert_select with an element that does not exist?"
-        elsif @selected
-          root = HTML::Node.new(nil)
-          root.children.concat @selected
-        else
-          # Otherwise just operate on the response document.
-          root = response_from_page_or_rjs
-        end
-        
-        # First or second argument is the selector: string and we pass
-        # all remaining arguments. Array and we pass the argument. Also
-        # accepts selector itself.
-        case arg
-          when String
-            selector = HTML::Selector.new(arg, args)
-          when Array
-            selector = HTML::Selector.new(*arg)
-          when HTML::Selector
-            selector = arg
-          else raise ArgumentError, "Expecting a selector as the first argument"
-        end
-        
-        # Next argument is used for equality tests.
-        equals = {}
-        case arg = args.shift
-          when Hash
-            equals = arg
-          when String, Regexp
-            equals[:text] = arg
-          when Integer
-            equals[:count] = arg
-          when Range
-            equals[:minimum] = arg.begin
-            equals[:maximum] = arg.end
-          when FalseClass
-            equals[:count] = 0
-          when NilClass, TrueClass
-            equals[:minimum] = 1
-          else raise ArgumentError, "I don't understand what you're trying to match"
-        end
-
-        # By default we're looking for at least one match.
-        if equals[:count]
-          equals[:minimum] = equals[:maximum] = equals[:count]
-        else
-          equals[:minimum] = 1 unless equals[:minimum]
-        end
-
-        # Last argument is the message we use if the assertion fails.
-        message = args.shift
-        #- message = "No match made with selector #{selector.inspect}" unless message
-        if args.shift
-          raise ArgumentError, "Not expecting that last argument, you either have too many arguments, or they're the wrong type"
-        end
-
-        matches = selector.select(root)
-        # If text/html, narrow down to those elements that match it.
-        content_mismatch = nil
-        if match_with = equals[:text]
-          matches.delete_if do |match|
-            text = ""
-            text.force_encoding(match_with.encoding) if text.respond_to?(:force_encoding)
-            stack = match.children.reverse
-            while node = stack.pop
-              if node.tag?
-                stack.concat node.children.reverse
-              else
-                content = node.content
-                content.force_encoding(match_with.encoding) if content.respond_to?(:force_encoding)
-                text << content
-              end
-            end
-            text.strip! unless NO_STRIP.include?(match.name)
-            unless match_with.is_a?(Regexp) ? (text =~ match_with) : (text == match_with.to_s)
-              content_mismatch ||= build_message(message, "<?> expected but was\n<?>.", match_with, text)
-              true
-            end
-          end
-        elsif match_with = equals[:html]
-          matches.delete_if do |match|
-            html = match.children.map(&:to_s).join
-            html.strip! unless NO_STRIP.include?(match.name)
-            unless match_with.is_a?(Regexp) ? (html =~ match_with) : (html == match_with.to_s)
-              content_mismatch ||= build_message(message, "<?> expected but was\n<?>.", match_with, html)
-              true
-            end
-          end
-        end
-        # Expecting foo found bar element only if found zero, not if
-        # found one but expecting two.
-        message ||= content_mismatch if matches.empty?
-        # Test minimum/maximum occurrence.
-        min, max = equals[:minimum], equals[:maximum]
-        message = message || %(Expected #{count_description(min, max)} matching "#{selector.to_s}", found #{matches.size}.)
-        assert matches.size >= min, message if min
-        assert matches.size <= max, message if max
-
-        # If a block is given call that block. Set @selected to allow
-        # nested assert_select, which can be nested several levels deep.
-        if block_given? && !matches.empty?
-          begin
-            in_scope, @selected = @selected, matches
-            yield matches
-          ensure
-            @selected = in_scope
-          end
-        end
-
-        # Returns all matches elements.
-        matches
-      end
-      
-      def count_description(min, max) #:nodoc:
-        pluralize = lambda {|word, quantity| word << (quantity == 1 ? '' : 's')}
-        
-        if min && max && (max != min)
-          "between #{min} and #{max} elements"
-        elsif min && !(min == 1 && max == 1)
-          "at least #{min} #{pluralize['element', min]}"
-        elsif max
-          "at most #{max} #{pluralize['element', max]}"
-        end
-      end
-      
-      # :call-seq:
-      #   assert_select_rjs(id?) { |elements| ... }
-      #   assert_select_rjs(statement, id?) { |elements| ... }
-      #   assert_select_rjs(:insert, position, id?) { |elements| ... }
-      #
-      # Selects content from the RJS response.
-      #
-      # === Narrowing down
-      #
-      # With no arguments, asserts that one or more elements are updated or
-      # inserted by RJS statements.
-      #
-      # Use the +id+ argument to narrow down the assertion to only statements
-      # that update or insert an element with that identifier.
-      #
-      # Use the first argument to narrow down assertions to only statements
-      # of that type. Possible values are <tt>:replace</tt>, <tt>:replace_html</tt>, 
-      # <tt>:show</tt>, <tt>:hide</tt>, <tt>:toggle</tt>, <tt>:remove</tt> and
-      # <tt>:insert_html</tt>.
-      #
-      # Use the argument <tt>:insert</tt> followed by an insertion position to narrow
-      # down the assertion to only statements that insert elements in that
-      # position. Possible values are <tt>:top</tt>, <tt>:bottom</tt>, <tt>:before</tt>
-      # and <tt>:after</tt>.
-      #
-      # Using the <tt>:remove</tt> statement, you will be able to pass a block, but it will
-      # be ignored as there is no HTML passed for this statement.
-      #
-      # === Using blocks
-      #
-      # Without a block, +assert_select_rjs+ merely asserts that the response
-      # contains one or more RJS statements that replace or update content.
-      #
-      # With a block, +assert_select_rjs+ also selects all elements used in
-      # these statements and passes them to the block. Nested assertions are
-      # supported.
-      #
-      # Calling +assert_select_rjs+ with no arguments and using nested asserts
-      # asserts that the HTML content is returned by one or more RJS statements.
-      # Using +assert_select+ directly makes the same assertion on the content,
-      # but without distinguishing whether the content is returned in an HTML
-      # or JavaScript.
-      #
-      # ==== Examples
-      #
-      #   # Replacing the element foo.
-      #   # page.replace 'foo', ...
-      #   assert_select_rjs :replace, "foo"
-      #
-      #   # Replacing with the chained RJS proxy.
-      #   # page[:foo].replace ...
-      #   assert_select_rjs :chained_replace, 'foo'
-      #
-      #   # Inserting into the element bar, top position.
-      #   assert_select_rjs :insert, :top, "bar"
-      #
-      #   # Remove the element bar
-      #   assert_select_rjs :remove, "bar"
-      #
-      #   # Changing the element foo, with an image.
-      #   assert_select_rjs "foo" do
-      #     assert_select "img[src=/images/logo.gif""
-      #   end
-      #
-      #   # RJS inserts or updates a list with four items.
-      #   assert_select_rjs do
-      #     assert_select "ol>li", 4
-      #   end
-      #
-      #   # The same, but shorter.
-      #   assert_select "ol>li", 4
-      def assert_select_rjs(*args, &block)
-        rjs_type = args.first.is_a?(Symbol) ? args.shift : nil
-        id       = args.first.is_a?(String) ? args.shift : nil
-
-        # If the first argument is a symbol, it's the type of RJS statement we're looking
-        # for (update, replace, insertion, etc). Otherwise, we're looking for just about
-        # any RJS statement.
-        if rjs_type
-          if rjs_type == :insert
-            position  = args.shift
-            id = args.shift
-            insertion = "insert_#{position}".to_sym
-            raise ArgumentError, "Unknown RJS insertion type #{position}" unless RJS_STATEMENTS[insertion]
-            statement = "(#{RJS_STATEMENTS[insertion]})"
-          else
-            raise ArgumentError, "Unknown RJS statement type #{rjs_type}" unless RJS_STATEMENTS[rjs_type]
-            statement = "(#{RJS_STATEMENTS[rjs_type]})"
-          end
-        else
-          statement = "#{RJS_STATEMENTS[:any]}"
-        end
-
-        # Next argument we're looking for is the element identifier. If missing, we pick
-        # any element, otherwise we replace it in the statement.
-        pattern = Regexp.new(
-          id ? statement.gsub(RJS_ANY_ID, "\"#{id}\"") : statement
-        )
-
-        # Duplicate the body since the next step involves destroying it.
-        matches = nil
-        case rjs_type
-          when :remove, :show, :hide, :toggle
-            matches = @response.body.match(pattern)
-          else
-            @response.body.gsub(pattern) do |match|
-              html = unescape_rjs(match)
-              matches ||= []
-              matches.concat HTML::Document.new(html).root.children.select { |n| n.tag? }
-              ""
-            end
-        end
-
-        if matches
-          assert_block("") { true } # to count the assertion
-          if block_given? && !([:remove, :show, :hide, :toggle].include? rjs_type)
-            begin
-              in_scope, @selected = @selected, matches
-              yield matches
-            ensure
-              @selected = in_scope
-            end
-          end
-          matches
-        else
-          # RJS statement not found.
-          case rjs_type
-            when :remove, :show, :hide, :toggle
-              flunk_message = "No RJS statement that #{rjs_type.to_s}s '#{id}' was rendered."
-            else
-              flunk_message = "No RJS statement that replaces or inserts HTML content."
-          end
-          flunk args.shift || flunk_message
-        end
-      end
-
-      # :call-seq:
-      #   assert_select_encoded(element?) { |elements| ... }
-      #
-      # Extracts the content of an element, treats it as encoded HTML and runs
-      # nested assertion on it.
-      #
-      # You typically call this method within another assertion to operate on
-      # all currently selected elements. You can also pass an element or array
-      # of elements.
-      #
-      # The content of each element is un-encoded, and wrapped in the root
-      # element +encoded+. It then calls the block with all un-encoded elements.
-      #
-      # ==== Examples
-      #   # Selects all bold tags from within the title of an ATOM feed's entries (perhaps to nab a section name prefix)
-      #   assert_select_feed :atom, 1.0 do
-      #     # Select each entry item and then the title item
-      #     assert_select "entry>title" do
-      #       # Run assertions on the encoded title elements
-      #       assert_select_encoded do
-      #         assert_select "b"
-      #       end
-      #     end
-      #   end
-      #   
-      #
-      #   # Selects all paragraph tags from within the description of an RSS feed
-      #   assert_select_feed :rss, 2.0 do
-      #     # Select description element of each feed item.
-      #     assert_select "channel>item>description" do
-      #       # Run assertions on the encoded elements.
-      #       assert_select_encoded do
-      #         assert_select "p"
-      #       end
-      #     end
-      #   end
-      def assert_select_encoded(element = nil, &block)
-        case element
-          when Array
-            elements = element
-          when HTML::Node
-            elements = [element]
-          when nil
-            unless elements = @selected
-              raise ArgumentError, "First argument is optional, but must be called from a nested assert_select"
-            end
-          else
-            raise ArgumentError, "Argument is optional, and may be node or array of nodes"
-        end
-
-        fix_content = lambda do |node|
-          # Gets around a bug in the Rails 1.1 HTML parser.
-          node.content.gsub(/<!\[CDATA\[(.*)(\]\]>)?/m) { CGI.escapeHTML($1) }
-        end
-
-        selected = elements.map do |element|
-          text = element.children.select{ |c| not c.tag? }.map{ |c| fix_content[c] }.join
-          root = HTML::Document.new(CGI.unescapeHTML("<encoded>#{text}</encoded>")).root
-          css_select(root, "encoded:root", &block)[0]
-        end
-
-        begin
-          old_selected, @selected = @selected, selected
-          assert_select ":root", &block
-        ensure
-          @selected = old_selected
-        end
-      end
-
-      # :call-seq:
-      #   assert_select_email { }
-      #
-      # Extracts the body of an email and runs nested assertions on it.
-      #
-      # You must enable deliveries for this assertion to work, use:
-      #   ActionMailer::Base.perform_deliveries = true
-      #
-      # ==== Examples
-      #
-      #  assert_select_email do
-      #    assert_select "h1", "Email alert"
-      #  end
-      #
-      #  assert_select_email do
-      #    items = assert_select "ol>li"
-      #    items.each do
-      #       # Work with items here...
-      #    end
-      #  end
-      #
-      def assert_select_email(&block)
-        deliveries = ActionMailer::Base.deliveries
-        assert !deliveries.empty?, "No e-mail in delivery list"
-
-        for delivery in deliveries
-          for part in delivery.parts
-            if part["Content-Type"].to_s =~ /^text\/html\W/
-              root = HTML::Document.new(part.body).root
-              assert_select root, ":root", &block
-            end
-          end
-        end
-      end
-
-      protected
-        unless const_defined?(:RJS_STATEMENTS)
-          RJS_PATTERN_HTML  = "\"((\\\\\"|[^\"])*)\""
-          RJS_ANY_ID        = "\"([^\"])*\""
-          RJS_STATEMENTS    = {
-            :chained_replace      => "\\$\\(#{RJS_ANY_ID}\\)\\.replace\\(#{RJS_PATTERN_HTML}\\)",
-            :chained_replace_html => "\\$\\(#{RJS_ANY_ID}\\)\\.update\\(#{RJS_PATTERN_HTML}\\)",
-            :replace_html         => "Element\\.update\\(#{RJS_ANY_ID}, #{RJS_PATTERN_HTML}\\)",
-            :replace              => "Element\\.replace\\(#{RJS_ANY_ID}, #{RJS_PATTERN_HTML}\\)"
-          }
-          [:remove, :show, :hide, :toggle].each do |action|
-            RJS_STATEMENTS[action] = "Element\\.#{action}\\(#{RJS_ANY_ID}\\)"
-          end
-          RJS_INSERTIONS = ["top", "bottom", "before", "after"]
-          RJS_INSERTIONS.each do |insertion|
-            RJS_STATEMENTS["insert_#{insertion}".to_sym] = "Element.insert\\(#{RJS_ANY_ID}, \\{ #{insertion}: #{RJS_PATTERN_HTML} \\}\\)"
-          end
-          RJS_STATEMENTS[:insert_html] = "Element.insert\\(#{RJS_ANY_ID}, \\{ (#{RJS_INSERTIONS.join('|')}): #{RJS_PATTERN_HTML} \\}\\)"
-          RJS_STATEMENTS[:any] = Regexp.new("(#{RJS_STATEMENTS.values.join('|')})")
-          RJS_PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
-        end
-
-        # +assert_select+ and +css_select+ call this to obtain the content in the HTML
-        # page, or from all the RJS statements, depending on the type of response.
-        def response_from_page_or_rjs()
-          content_type = @response.content_type
-
-          if content_type && Mime::JS =~ content_type
-            body = @response.body.dup
-            root = HTML::Node.new(nil)
-
-            while true
-              next if body.sub!(RJS_STATEMENTS[:any]) do |match|
-                html = unescape_rjs(match)
-                matches = HTML::Document.new(html).root.children.select { |n| n.tag? }
-                root.children.concat matches
-                ""
-              end
-              break
-            end
-
-            root
-          else
-            html_document.root
-          end
-        end
-
-        # Unescapes a RJS string.
-        def unescape_rjs(rjs_string)
-          # RJS encodes double quotes and line breaks.
-          unescaped= rjs_string.gsub('\"', '"')
-          unescaped.gsub!(/\\\//, '/')
-          unescaped.gsub!('\n', "\n")
-          unescaped.gsub!('\076', '>')
-          unescaped.gsub!('\074', '<')
-          # RJS encodes non-ascii characters.
-          unescaped.gsub!(RJS_PATTERN_UNICODE_ESCAPED_CHAR) {|u| [$1.hex].pack('U*')}
-          unescaped
-        end
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/testing/assertions/tag.rb b/actionpack/lib/action_controller/testing/assertions/tag.rb
deleted file mode 100644
index d9197b7855..0000000000
--- a/actionpack/lib/action_controller/testing/assertions/tag.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-module ActionController
-  module Assertions
-    # Pair of assertions to testing elements in the HTML output of the response.
-    module TagAssertions
-      # Asserts that there is a tag/node/element in the body of the response
-      # that meets all of the given conditions. The +conditions+ parameter must
-      # be a hash of any of the following keys (all are optional):
-      #
-      # * <tt>:tag</tt>: the node type must match the corresponding value
-      # * <tt>:attributes</tt>: a hash. The node's attributes must match the
-      #   corresponding values in the hash.
-      # * <tt>:parent</tt>: a hash. The node's parent must match the
-      #   corresponding hash.
-      # * <tt>:child</tt>: a hash. At least one of the node's immediate children
-      #   must meet the criteria described by the hash.
-      # * <tt>:ancestor</tt>: a hash. At least one of the node's ancestors must
-      #   meet the criteria described by the hash.
-      # * <tt>:descendant</tt>: a hash. At least one of the node's descendants
-      #   must meet the criteria described by the hash.
-      # * <tt>:sibling</tt>: a hash. At least one of the node's siblings must
-      #   meet the criteria described by the hash.
-      # * <tt>:after</tt>: a hash. The node must be after any sibling meeting
-      #   the criteria described by the hash, and at least one sibling must match.
-      # * <tt>:before</tt>: a hash. The node must be before any sibling meeting
-      #   the criteria described by the hash, and at least one sibling must match.
-      # * <tt>:children</tt>: a hash, for counting children of a node. Accepts
-      #   the keys:
-      #   * <tt>:count</tt>: either a number or a range which must equal (or
-      #     include) the number of children that match.
-      #   * <tt>:less_than</tt>: the number of matching children must be less
-      #     than this number.
-      #   * <tt>:greater_than</tt>: the number of matching children must be
-      #     greater than this number.
-      #   * <tt>:only</tt>: another hash consisting of the keys to use
-      #     to match on the children, and only matching children will be
-      #     counted.
-      # * <tt>:content</tt>: the textual content of the node must match the
-      #   given value. This will not match HTML tags in the body of a
-      #   tag--only text.
-      #
-      # Conditions are matched using the following algorithm:
-      #
-      # * if the condition is a string, it must be a substring of the value.
-      # * if the condition is a regexp, it must match the value.
-      # * if the condition is a number, the value must match number.to_s.
-      # * if the condition is +true+, the value must not be +nil+.
-      # * if the condition is +false+ or +nil+, the value must be +nil+.
-      #
-      # === Examples
-      #
-      #   # Assert that there is a "span" tag
-      #   assert_tag :tag => "span"
-      #
-      #   # Assert that there is a "span" tag with id="x"
-      #   assert_tag :tag => "span", :attributes => { :id => "x" }
-      #
-      #   # Assert that there is a "span" tag using the short-hand
-      #   assert_tag :span
-      #
-      #   # Assert that there is a "span" tag with id="x" using the short-hand
-      #   assert_tag :span, :attributes => { :id => "x" }
-      #
-      #   # Assert that there is a "span" inside of a "div"
-      #   assert_tag :tag => "span", :parent => { :tag => "div" }
-      #
-      #   # Assert that there is a "span" somewhere inside a table
-      #   assert_tag :tag => "span", :ancestor => { :tag => "table" }
-      #
-      #   # Assert that there is a "span" with at least one "em" child
-      #   assert_tag :tag => "span", :child => { :tag => "em" }
-      #
-      #   # Assert that there is a "span" containing a (possibly nested)
-      #   # "strong" tag.
-      #   assert_tag :tag => "span", :descendant => { :tag => "strong" }
-      #
-      #   # Assert that there is a "span" containing between 2 and 4 "em" tags
-      #   # as immediate children
-      #   assert_tag :tag => "span",
-      #              :children => { :count => 2..4, :only => { :tag => "em" } } 
-      #
-      #   # Get funky: assert that there is a "div", with an "ul" ancestor
-      #   # and an "li" parent (with "class" = "enum"), and containing a 
-      #   # "span" descendant that contains text matching /hello world/
-      #   assert_tag :tag => "div",
-      #              :ancestor => { :tag => "ul" },
-      #              :parent => { :tag => "li",
-      #                           :attributes => { :class => "enum" } },
-      #              :descendant => { :tag => "span",
-      #                               :child => /hello world/ }
-      #
-      # <b>Please note</b>: +assert_tag+ and +assert_no_tag+ only work
-      # with well-formed XHTML. They recognize a few tags as implicitly self-closing
-      # (like br and hr and such) but will not work correctly with tags
-      # that allow optional closing tags (p, li, td). <em>You must explicitly
-      # close all of your tags to use these assertions.</em>
-      def assert_tag(*opts)
-        opts = opts.size > 1 ? opts.last.merge({ :tag => opts.first.to_s }) : opts.first
-        tag = find_tag(opts)
-        assert tag, "expected tag, but no tag found matching #{opts.inspect} in:\n#{@response.body.inspect}"
-      end
-      
-      # Identical to +assert_tag+, but asserts that a matching tag does _not_
-      # exist. (See +assert_tag+ for a full discussion of the syntax.)
-      #
-      # === Examples
-      #   # Assert that there is not a "div" containing a "p"
-      #   assert_no_tag :tag => "div", :descendant => { :tag => "p" }
-      #
-      #   # Assert that an unordered list is empty
-      #   assert_no_tag :tag => "ul", :descendant => { :tag => "li" }
-      #
-      #   # Assert that there is not a "p" tag with between 1 to 3 "img" tags
-      #   # as immediate children
-      #   assert_no_tag :tag => "p",
-      #              :children => { :count => 1..3, :only => { :tag => "img" } }
-      def assert_no_tag(*opts)
-        opts = opts.size > 1 ? opts.last.merge({ :tag => opts.first.to_s }) : opts.first
-        tag = find_tag(opts)
-        assert !tag, "expected no tag, but found tag matching #{opts.inspect} in:\n#{@response.body.inspect}"
-      end
-    end
-  end
-end