actionpack 3.2.19 → 4.0.0

data/lib/action_dispatch/testing/assertions/routing.rb

@@ -1,6 +1,6 @@
 require 'uri'
-require 'active_support/core_ext/hash/diff'
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/string/access'
 require 'action_controller/metal/exceptions'
 
 module ActionDispatch
@@ -15,38 +15,40 @@ module ActionDispatch
       # 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})
+      #   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" })
+      #   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')
+      #   assert_recognizes({controller: 'items', action: 'index'}, 'items')
       #
       #   # Test a specific action
-      #   assert_recognizes({:controller => 'items', :action => 'list'}, 'items/list')
+      #   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')
+      #   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')
-      def assert_recognizes(expected_options, path, extras={}, message=nil)
+      #   assert_recognizes({controller: 'items', action: 'show', id: '1'}, 'view/item1')
+      def assert_recognizes(expected_options, path, extras={}, msg=nil)
         request = recognized_request_for(path, extras)
 
         expected_options = expected_options.clone
-        extras.each_key { |key| expected_options.delete key } unless extras.nil?
 
         expected_options.stringify_keys!
-        msg = build_message(message, "The recognized options <?> did not match <?>, difference: <?>",
-            request.path_parameters, expected_options, expected_options.diff(request.path_parameters))
+
+        msg = message(msg, "") {
+          sprintf("The recognized options <%s> did not match <%s>, difference:",
+                  request.path_parameters, expected_options)
+        }
+
         assert_equal(expected_options, request.path_parameters, msg)
       end
 
@@ -56,25 +58,22 @@ module ActionDispatch
       #
       # 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"
+      #   assert_generates "/items", controller: "items", action: "index"
       #
       #   # Tests that the list action is properly routed
-      #   assert_generates "/items/list", :controller => "items", :action => "list"
+      #   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" }
+      #   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" }
+      #   assert_generates "changesets/12", { controller: 'scm', action: 'show_diff', revision: "12" }
       def assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)
         if expected_path =~ %r{://}
-          begin
+          fail_on(URI::InvalidURIError) do
             uri = URI.parse(expected_path)
             expected_path = uri.path.to_s.empty? ? "/" : uri.path
-          rescue URI::InvalidURIError => e
-            raise ActionController::RoutingError, e.message
           end
         else
           expected_path = "/#{expected_path}" unless expected_path.first == '/'
@@ -82,12 +81,12 @@ module ActionDispatch
         # Load routes.rb if it hasn't been loaded.
 
         generated_path, extra_keys = @routes.generate_extras(options, defaults)
-        found_extras = options.reject {|k, v| ! extra_keys.include? k}
+        found_extras = options.reject { |k, _| ! extra_keys.include? k }
 
-        msg = build_message(message, "found extras <?>, not <?>", found_extras, extras)
+        msg = message || sprintf("found extras <%s>, not <%s>", found_extras, extras)
         assert_equal(extras, found_extras, msg)
 
-        msg = build_message(message, "The generated path <?> did not match <?>", generated_path,
+        msg = message || sprintf("The generated path <%s> did not match <%s>", generated_path,
             expected_path)
         assert_equal(expected_path, generated_path, msg)
       end
@@ -99,21 +98,20 @@ module ActionDispatch
       # 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'
+      #  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_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'
+      #  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"}
+      #  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" })
+      #  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)
 
@@ -122,7 +120,7 @@ module ActionDispatch
           options[:controller] = "/#{controller}"
         end
 
-        generate_options = options.dup.delete_if{ |k,v| defaults.key?(k) }
+        generate_options = options.dup.delete_if{ |k, _| defaults.key?(k) }
         assert_generates(path.is_a?(Hash) ? path[:path] : path, generate_options, defaults, extras, message)
       end
 
@@ -131,16 +129,13 @@ module ActionDispatch
       # with a new RouteSet instance.
       #
       # The new instance is yielded to the passed block. Typically the block
-      # will create some routes using <tt>map.draw { map.connect ... }</tt>:
+      # will create some routes using <tt>set.draw { match ... }</tt>:
       #
       #   with_routing do |set|
-      #     set.draw do |map|
-      #       map.connect ':controller/:action/:id'
-      #         assert_equal(
-      #           ['/content/10/show', {}],
-      #           map.generate(:controller => 'content', :id => 10, :action => 'show')
-      #       end
+      #     set.draw do
+      #       resources :users
       #     end
+      #     assert_equal "/users", users_path
       #   end
       #
       def with_routing
@@ -191,14 +186,12 @@ module ActionDispatch
           request = ActionController::TestRequest.new
 
           if path =~ %r{://}
-            begin
+            fail_on(URI::InvalidURIError) do
               uri = URI.parse(path)
               request.env["rack.url_scheme"] = uri.scheme || "http"
               request.host = uri.host if uri.host
               request.port = uri.port if uri.port
               request.path = uri.path.to_s.empty? ? "/" : uri.path
-            rescue URI::InvalidURIError => e
-              raise ActionController::RoutingError, e.message
             end
           else
             path = "/#{path}" unless path.first == "/"
@@ -207,11 +200,19 @@ module ActionDispatch
 
           request.request_method = method if method
 
-          params = @routes.recognize_path(path, { :method => method, :extras => extras })
+          params = fail_on(ActionController::RoutingError) do
+            @routes.recognize_path(path, { :method => method, :extras => extras })
+          end
           request.path_parameters = params.with_indifferent_access
 
           request
         end
+
+        def fail_on(exception_class)
+          yield
+        rescue exception_class => e
+          raise MiniTest::Assertion, e.message
+        end
     end
   end
 end

data/lib/action_dispatch/testing/assertions/selector.rb

@@ -1,4 +1,4 @@
-require 'action_controller/vendor/html-scanner'
+require 'action_view/vendor/html-scanner'
 require 'active_support/core_ext/object/inclusion'
 
 #--
@@ -39,7 +39,6 @@ module ActionDispatch
       # 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")
       #
@@ -58,7 +57,6 @@ module ActionDispatch
       #     inputs = css_select(form, "input")
       #     ...
       #   end
-      #
       def css_select(*args)
         # See assert_select to understand what's going on here.
         arg = args.shift
@@ -157,8 +155,6 @@ module ActionDispatch
       # 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"
       #
@@ -169,7 +165,7 @@ module ActionDispatch
       #   assert_select "title", "Welcome"
       #
       #   # Page title is "Welcome" and there is only one title element
-      #   assert_select "title", {:count => 1, :text => "Welcome"},
+      #   assert_select "title", {count: 1, text: "Welcome"},
       #       "Wrong title or more than one title element"
       #
       #   # Page contains no forms
@@ -271,7 +267,7 @@ module ActionDispatch
             text.strip! unless NO_STRIP.include?(match.name)
             text.sub!(/\A\n/, '') if match.name == "textarea"
             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)
+              content_mismatch ||= sprintf("<%s> expected but was\n<%s>.", match_with, text)
               true
             end
           end
@@ -280,7 +276,7 @@ module ActionDispatch
             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)
+              content_mismatch ||= sprintf("<%s> expected but was\n<%s>.", match_with, html)
               true
             end
           end
@@ -290,12 +286,15 @@ module ActionDispatch
         message ||= content_mismatch if matches.empty?
         # Test minimum/maximum occurrence.
         min, max, count = equals[:minimum], equals[:maximum], equals[:count]
+
+        # FIXME: minitest provides messaging when we use assert_operator,
+        # so is this custom message really needed?
         message = message || %(Expected #{count_description(min, max, count)} matching "#{selector.to_s}", found #{matches.size}.)
         if count
-          assert matches.size == count, message
+          assert_equal matches.size, count, message
         else
-          assert matches.size >= min, message if min
-          assert matches.size <= max, message if max
+          assert_operator matches.size, :>=, min, message if min
+          assert_operator matches.size, :<=, max, message if max
         end
 
         # If a block is given call that block. Set @selected to allow
@@ -337,9 +336,8 @@ module ActionDispatch
       # 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
+      #   # Selects all bold tags from within the title of an Atom feed's entries (perhaps to nab a section name prefix)
+      #   assert_select "feed[xmlns='http://www.w3.org/2005/Atom']" do
       #     # Select each entry item and then the title item
       #     assert_select "entry>title" do
       #       # Run assertions on the encoded title elements
@@ -351,7 +349,7 @@ module ActionDispatch
       #
       #
       #   # Selects all paragraph tags from within the description of an RSS feed
-      #   assert_select_feed :rss, 2.0 do
+      #   assert_select "rss[version=2.0]" do
       #     # Select description element of each feed item.
       #     assert_select "channel>item>description" do
       #       # Run assertions on the encoded elements.
@@ -379,8 +377,8 @@ module ActionDispatch
           node.content.gsub(/<!\[CDATA\[(.*)(\]\]>)?/m) { Rack::Utils.escapeHTML($1) }
         end
 
-        selected = elements.map do |_element|
-          text = _element.children.select{ |c| not c.tag? }.map{ |c| fix_content[c] }.join
+        selected = elements.map do |elem|
+          text = elem.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
@@ -398,8 +396,6 @@ module ActionDispatch
       # 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
@@ -410,13 +406,12 @@ module ActionDispatch
       #       # 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.empty? ? [delivery] : delivery.parts)
+        deliveries.each do |delivery|
+          (delivery.parts.empty? ? [delivery] : delivery.parts).each do |part|
             if part["Content-Type"].to_s =~ /^text\/html\W/
               root = HTML::Document.new(part.body.to_s).root
               assert_select root, ":root", &block

data/lib/action_dispatch/testing/assertions/tag.rb

@@ -1,4 +1,4 @@
-require 'action_controller/vendor/html-scanner'
+require 'action_view/vendor/html-scanner'
 
 module ActionDispatch
   module Assertions
@@ -48,47 +48,45 @@ module ActionDispatch
       # * 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_tag tag: "span"
       #
       #   # Assert that there is a "span" tag with id="x"
-      #   assert_tag :tag => "span", :attributes => { :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_tag :span, attributes: { id: "x" }
       #
       #   # Assert that there is a "span" inside of a "div"
-      #   assert_tag :tag => "span", :parent => { :tag => "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_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_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_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" } }
+      #   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/ }
+      #   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
@@ -104,17 +102,16 @@ module ActionDispatch
       # 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_no_tag tag: "div", descendant: { tag: "p" }
       #
       #   # Assert that an unordered list is empty
-      #   assert_no_tag :tag => "ul", :descendant => { :tag => "li" }
+      #   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" } }
+      #   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)