actionpack 3.2.22.5 → 4.0.0.beta1

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.
@@ -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)

data/lib/action_dispatch/testing/integration.rb

@@ -1,10 +1,9 @@
 require 'stringio'
 require 'uri'
 require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/object/inclusion'
 require 'active_support/core_ext/object/try'
 require 'rack/test'
-require 'test/unit/assertions'
+require 'minitest/unit'
 
 module ActionDispatch
   module Integration #:nodoc:
@@ -21,14 +20,14 @@ module ActionDispatch
       # - +headers+: Additional headers to pass, as a Hash. The headers will be
       #   merged into the Rack env hash.
       #
-      # This method returns an Response object, which one can use to
+      # This method returns a Response object, which one can use to
       # inspect the details of the response. Furthermore, if this method was
       # called from an ActionDispatch::IntegrationTest object, then that
       # object's <tt>@response</tt> instance variable will point to the same
       # response object.
       #
-      # You can also perform POST, PUT, DELETE, and HEAD requests with +#post+,
-      # +#put+, +#delete+, and +#head+.
+      # You can also perform POST, PATCH, PUT, DELETE, and HEAD requests with
+      # +#post+, +#patch+, +#put+, +#delete+, and +#head+.
       def get(path, parameters = nil, headers = nil)
         process :get, path, parameters, headers
       end
@@ -39,6 +38,12 @@ module ActionDispatch
         process :post, path, parameters, headers
       end
 
+      # Performs a PATCH request with the given parameters. See +#get+ for more
+      # details.
+      def patch(path, parameters = nil, headers = nil)
+        process :patch, path, parameters, headers
+      end
+
       # Performs a PUT request with the given parameters. See +#get+ for more
       # details.
       def put(path, parameters = nil, headers = nil)
@@ -57,12 +62,18 @@ module ActionDispatch
         process :head, path, parameters, headers
       end
 
+      # Performs a OPTIONS request with the given parameters. See +#get+ for
+      # more details.
+      def options(path, parameters = nil, headers = nil)
+        process :options, path, parameters, headers
+      end
+
       # Performs an XMLHttpRequest request with the given parameters, mirroring
       # a request from the Prototype library.
       #
-      # The request_method is +:get+, +:post+, +:put+, +:delete+ or +:head+; the
-      # parameters are +nil+, a hash, or a url-encoded or multipart string;
-      # the headers are a hash.
+      # The request_method is +:get+, +:post+, +:patch+, +:put+, +:delete+ or
+      # +:head+; the parameters are +nil+, a hash, or a url-encoded or multipart
+      # string; the headers are a hash.
       def xml_http_request(request_method, path, parameters = nil, headers = nil)
         headers ||= {}
         headers['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
@@ -102,6 +113,12 @@ module ActionDispatch
         request_via_redirect(:post, path, parameters, headers)
       end
 
+      # Performs a PATCH request, following any subsequent redirect.
+      # See +request_via_redirect+ for more information.
+      def patch_via_redirect(path, parameters = nil, headers = nil)
+        request_via_redirect(:patch, path, parameters, headers)
+      end
+
       # Performs a PUT request, following any subsequent redirect.
       # See +request_via_redirect+ for more information.
       def put_via_redirect(path, parameters = nil, headers = nil)
@@ -126,7 +143,7 @@ module ActionDispatch
     class Session
       DEFAULT_HOST = "www.example.com"
 
-      include Test::Unit::Assertions
+      include MiniTest::Assertions
       include TestProcess, RequestHelpers, Assertions
 
       %w( status status_message headers body redirect? ).each do |method|
@@ -256,7 +273,7 @@ module ActionDispatch
           if path =~ %r{://}
             location = URI.parse(path)
             https! URI::HTTPS === location if location.scheme
-            host! location.host if location.host
+            host! "#{location.host}:#{location.port}" if location.host
             path = location.query ? "#{location.path}?#{location.query}" : location.path
           end
 
@@ -324,12 +341,12 @@ module ActionDispatch
         @integration_session = Integration::Session.new(app)
       end
 
-      %w(get post put head delete cookies assigns
+      %w(get post patch put head delete options cookies assigns
          xml_http_request xhr get_via_redirect post_via_redirect).each do |method|
         define_method(method) do |*args|
           reset! unless integration_session
           # reset the html_document variable, but only for new get/post calls
-          @html_document = nil unless method.in?(["cookies", "assigns"])
+          @html_document = nil unless method == 'cookies' || method == 'assigns'
           integration_session.__send__(method, *args).tap do
             copy_session_variables!
           end
@@ -367,7 +384,7 @@ module ActionDispatch
       end
 
       def default_url_options=(options)
-        integration_session.url_options
+        reset! unless integration_session
         integration_session.default_url_options = options
       end
 
@@ -413,8 +430,8 @@ module ActionDispatch
   #       assert_equal 200, status
   #
   #       # post the login and follow through to the home page
-  #       post "/login", :username => people(:jamis).username,
-  #         :password => people(:jamis).password
+  #       post "/login", username: people(:jamis).username,
+  #         password: people(:jamis).password
   #       follow_redirect!
   #       assert_equal 200, status
   #       assert_equal "/home", path
@@ -447,13 +464,13 @@ module ActionDispatch
   #       module CustomAssertions
   #         def enter(room)
   #           # reference a named route, for maximum internal consistency!
-  #           get(room_url(:id => room.id))
+  #           get(room_url(id: room.id))
   #           assert(...)
   #           ...
   #         end
   #
   #         def speak(room, message)
-  #           xml_http_request "/say/#{room.id}", :message => message
+  #           xml_http_request "/say/#{room.id}", message: message
   #           assert(...)
   #           ...
   #         end
@@ -463,8 +480,8 @@ module ActionDispatch
   #         open_session do |sess|
   #           sess.extend(CustomAssertions)
   #           who = people(who)
-  #           sess.post "/login", :username => who.username,
-  #             :password => who.password
+  #           sess.post "/login", username: who.username,
+  #             password: who.password
   #           assert(...)
   #         end
   #       end
@@ -477,9 +494,11 @@ module ActionDispatch
     @@app = nil
 
     def self.app
-      # DEPRECATE Rails application fallback
-      # This should be set by the initializer
-      @@app || (defined?(Rails.application) && Rails.application) || nil
+      if !@@app && !ActionDispatch.test_app
+        ActiveSupport::Deprecation.warn "Rails application fallback is deprecated and no longer works, please set ActionDispatch.test_app"
+      end
+
+      @@app || ActionDispatch.test_app
     end
 
     def self.app=(app)

data/lib/action_dispatch/testing/test_process.rb

@@ -5,7 +5,8 @@ require 'active_support/core_ext/hash/indifferent_access'
 module ActionDispatch
   module TestProcess
     def assigns(key = nil)
-      assigns = @controller.view_assigns.with_indifferent_access
+      assigns = {}.with_indifferent_access
+      @controller.view_assigns.each {|k, v| assigns.regular_writer(k, v)}
       key.nil? ? assigns : assigns[key]
     end
 
@@ -25,17 +26,19 @@ module ActionDispatch
       @response.redirect_url
     end
 
-    # Shortcut for <tt>Rack::Test::UploadedFile.new(ActionController::TestCase.fixture_path + path, type)</tt>:
+    # Shortcut for <tt>Rack::Test::UploadedFile.new(File.join(ActionController::TestCase.fixture_path, path), type)</tt>:
     #
-    #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png')
+    #   post :change_avatar, avatar: fixture_file_upload('files/spongebob.png', 'image/png')
     #
     # To upload binary files on Windows, pass <tt>:binary</tt> as the last parameter.
     # This will not affect other platforms:
     #
-    #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png', :binary)
+    #   post :change_avatar, avatar: fixture_file_upload('files/spongebob.png', 'image/png', :binary)
     def fixture_file_upload(path, mime_type = nil, binary = false)
-      fixture_path = self.class.fixture_path if self.class.respond_to?(:fixture_path)
-      Rack::Test::UploadedFile.new("#{fixture_path}#{path}", mime_type, binary)
+      if self.class.respond_to?(:fixture_path) && self.class.fixture_path
+        path = File.join(self.class.fixture_path, path)
+      end
+      Rack::Test::UploadedFile.new(path, mime_type, binary)
     end
   end
 end

data/lib/action_dispatch/testing/test_request.rb

@@ -1,6 +1,4 @@
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/hash/reverse_merge'
 require 'rack/utils'
 
 module ActionDispatch
@@ -13,7 +11,7 @@ module ActionDispatch
 
     def initialize(env = {})
       env = Rails.application.env_config.merge(env) if defined?(Rails.application) && Rails.application
-      super(DEFAULT_ENV.merge(env))
+      super(default_env.merge(env))
 
       self.host        = 'test.host'
       self.remote_addr = '0.0.0.0'
@@ -70,5 +68,11 @@ module ActionDispatch
     def cookies
       @cookies ||= {}.with_indifferent_access
     end
+
+    private
+
+    def default_env
+      DEFAULT_ENV
+    end
   end
 end

data/lib/action_pack.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2011 David Heinemeier Hansson
+# Copyright (c) 2004-2013 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/action_pack/version.rb

@@ -1,9 +1,9 @@
 module ActionPack
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
-    TINY  = 22
-    PRE   = "5"
+    MAJOR = 4
+    MINOR = 0
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end