From 013c74d645a5842ce35857e4f14af7fc9961c54d Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 10 Jul 2014 16:33:22 -0700
Subject: Removed single space padding from empty response body.

`render nothing: true` or rendering a `nil` body no longer add a single
space to the response body.

The old behavior was added as a workaround for a bug in an early version of
Safari, where the HTTP headers are not returned correctly if the response
body has a 0-length. This is been fixed since and the workaround is no
longer necessary.

Use `render body: ' '` if the old behavior is desired.
---
 actionpack/test/controller/new_base/render_body_test.rb  | 8 ++++----
 actionpack/test/controller/new_base/render_html_test.rb  | 8 ++++----
 actionpack/test/controller/new_base/render_plain_test.rb | 8 ++++----
 actionpack/test/controller/new_base/render_text_test.rb  | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/new_base/render_body_test.rb b/actionpack/test/controller/new_base/render_body_test.rb
index fad848349a..f4a3db8b41 100644
--- a/actionpack/test/controller/new_base/render_body_test.rb
+++ b/actionpack/test/controller/new_base/render_body_test.rb
@@ -111,17 +111,17 @@ module RenderBody
       assert_status 404
     end
 
-    test "rendering body with nil returns an empty body padded for Safari" do
+    test "rendering body with nil returns an empty body" do
       get "/render_body/with_layout/with_nil"
 
-      assert_body " "
+      assert_body ""
       assert_status 200
     end
 
-    test "Rendering body with nil and custom status code returns an empty body padded for Safari and the status" do
+    test "Rendering body with nil and custom status code returns an empty body and the status" do
       get "/render_body/with_layout/with_nil_and_status"
 
-      assert_body " "
+      assert_body ""
       assert_status 403
     end
 
diff --git a/actionpack/test/controller/new_base/render_html_test.rb b/actionpack/test/controller/new_base/render_html_test.rb
index bfe0271df7..fe11501eeb 100644
--- a/actionpack/test/controller/new_base/render_html_test.rb
+++ b/actionpack/test/controller/new_base/render_html_test.rb
@@ -114,17 +114,17 @@ module RenderHtml
       assert_status 404
     end
 
-    test "rendering text with nil returns an empty body padded for Safari" do
+    test "rendering text with nil returns an empty body" do
       get "/render_html/with_layout/with_nil"
 
-      assert_body " "
+      assert_body ""
       assert_status 200
     end
 
-    test "Rendering text with nil and custom status code returns an empty body padded for Safari and the status" do
+    test "Rendering text with nil and custom status code returns an empty body and the status" do
       get "/render_html/with_layout/with_nil_and_status"
 
-      assert_body " "
+      assert_body ""
       assert_status 403
     end
 
diff --git a/actionpack/test/controller/new_base/render_plain_test.rb b/actionpack/test/controller/new_base/render_plain_test.rb
index dba2e9f13e..0e36d36b50 100644
--- a/actionpack/test/controller/new_base/render_plain_test.rb
+++ b/actionpack/test/controller/new_base/render_plain_test.rb
@@ -106,17 +106,17 @@ module RenderPlain
       assert_status 404
     end
 
-    test "rendering text with nil returns an empty body padded for Safari" do
+    test "rendering text with nil returns an empty body" do
       get "/render_plain/with_layout/with_nil"
 
-      assert_body " "
+      assert_body ""
       assert_status 200
     end
 
-    test "Rendering text with nil and custom status code returns an empty body padded for Safari and the status" do
+    test "Rendering text with nil and custom status code returns an empty body and the status" do
       get "/render_plain/with_layout/with_nil_and_status"
 
-      assert_body " "
+      assert_body ""
       assert_status 403
     end
 
diff --git a/actionpack/test/controller/new_base/render_text_test.rb b/actionpack/test/controller/new_base/render_text_test.rb
index abb81d7e71..10bad57cd6 100644
--- a/actionpack/test/controller/new_base/render_text_test.rb
+++ b/actionpack/test/controller/new_base/render_text_test.rb
@@ -106,17 +106,17 @@ module RenderText
       assert_status 404
     end
 
-    test "rendering text with nil returns an empty body padded for Safari" do
+    test "rendering text with nil returns an empty body" do
       get "/render_text/with_layout/with_nil"
 
-      assert_body " "
+      assert_body ""
       assert_status 200
     end
 
-    test "Rendering text with nil and custom status code returns an empty body padded for Safari and the status" do
+    test "Rendering text with nil and custom status code returns an empty body and the status" do
       get "/render_text/with_layout/with_nil_and_status"
 
-      assert_body " "
+      assert_body ""
       assert_status 403
     end
 
-- 
cgit v1.2.3


From dfee0327b5528caacfe277ccf4d0168b7b96cc05 Mon Sep 17 00:00:00 2001
From: Santosh Wadghule <santosh.wadghule@gmail.com>
Date: Mon, 14 Jul 2014 00:05:00 +0530
Subject: Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci
 skip]

---
 actionpack/test/controller/new_base/render_template_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index b7a9cf92f2..e87811776a 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -9,7 +9,7 @@ module RenderTemplate
       "locals.html.erb"            => "The secret is <%= secret %>",
       "xml_template.xml.builder"   => "xml.html do\n  xml.p 'Hello'\nend",
       "with_raw.html.erb"          => "Hello <%=raw '<strong>this is raw</strong>' %>",
-      "with_implicit_raw.html.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in a html template",
+      "with_implicit_raw.html.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in an html template",
       "with_implicit_raw.text.erb" => "Hello <%== '<strong>this is also raw</strong>' %> in a text template",
       "test/with_json.html.erb"    => "<%= render :template => 'test/with_json', :formats => [:json] %>",
       "test/with_json.json.erb"    => "<%= render :template => 'test/final', :formats => [:json]  %>",
@@ -114,7 +114,7 @@ module RenderTemplate
 
       get :with_implicit_raw
 
-      assert_body "Hello <strong>this is also raw</strong> in a html template"
+      assert_body "Hello <strong>this is also raw</strong> in an html template"
       assert_status 200
 
       get :with_implicit_raw, format: 'text'
-- 
cgit v1.2.3


From f49d20ef36c2d339e7a988fdc52981cdb95af22f Mon Sep 17 00:00:00 2001
From: Grey Baker <greysteil@gmail.com>
Date: Sun, 13 Jul 2014 17:58:20 +0100
Subject: Stash original path in `ShowExceptions` middleware

`ActionDispatch::ShowExceptions` overwrites `PATH_INFO` with the status code
for the exception defined in `ExceptionWrapper`, so the path the user was
visiting when an exception occurred was not previously available to any custom
exceptions_app.

The original `PATH_INFO` is now stashed in
`env["action_dispatch.original_path"]`.
---
 actionpack/test/dispatch/show_exceptions_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 38bd234f37..323fbc285e 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -37,7 +37,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     get "/", {}, {'action_dispatch.show_exceptions' => true}
     assert_response 500
     assert_equal "500 error fixture\n", body
-    
+
     get "/bad_params", {}, {'action_dispatch.show_exceptions' => true}
     assert_response 400
     assert_equal "400 error fixture\n", body
@@ -92,6 +92,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     exceptions_app = lambda do |env|
       assert_kind_of AbstractController::ActionNotFound, env["action_dispatch.exception"]
       assert_equal "/404", env["PATH_INFO"]
+      assert_equal "/not_found_original_exception", env["action_dispatch.original_path"]
       [404, { "Content-Type" => "text/plain" }, ["YOU FAILED BRO"]]
     end
 
-- 
cgit v1.2.3


From 0777b17dafd54442409c02237be8b5562025ed3f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Jul 2014 15:33:30 -0700
Subject: RouteSet should be in charge of constructing the dispather

Now we can override how requests are dispatched in the routeset object
---
 actionpack/test/dispatch/mapper_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/mapper_test.rb b/actionpack/test/dispatch/mapper_test.rb
index d8d3209dac..3e554a9cf6 100644
--- a/actionpack/test/dispatch/mapper_test.rb
+++ b/actionpack/test/dispatch/mapper_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 module ActionDispatch
   module Routing
     class MapperTest < ActiveSupport::TestCase
-      class FakeSet
+      class FakeSet < ActionDispatch::Routing::RouteSet
         attr_reader :routes
         alias :set :routes
 
@@ -38,7 +38,7 @@ module ActionDispatch
 
       def test_mapping_requirements
         options = { :controller => 'foo', :action => 'bar', :via => :get }
-        m = Mapper::Mapping.build({}, '/store/:name(*rest)', options)
+        m = Mapper::Mapping.build({}, FakeSet.new, '/store/:name(*rest)', options)
         _, _, requirements, _ = m.to_route
         assert_equal(/.+?/, requirements[:rest])
       end
-- 
cgit v1.2.3


From 07f7f3a67c59292babe8b02baec5a7a7f5313421 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Jul 2014 15:39:45 -0700
Subject: remove useless ivar set

---
 actionpack/test/controller/routing_test.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 721dad4dd9..bd5b4e092f 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1606,7 +1606,6 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_slashes_are_implied
-    @set = nil
     set.draw { get("/:controller(/:action(/:id))") }
 
     assert_equal '/content',        url_for(set, { :controller => 'content', :action => 'index' })
-- 
cgit v1.2.3


From ab1e3228f8c5a071eb7fb5f8b577eb706248fe9a Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Jul 2014 15:41:13 -0700
Subject: set `set` in the setup method

---
 actionpack/test/controller/routing_test.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index bd5b4e092f..9543787555 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -839,8 +839,11 @@ end
 class RouteSetTest < ActiveSupport::TestCase
   include RoutingTestHelpers
 
-  def set
-    @set ||= ROUTING::RouteSet.new
+  attr_reader :set
+
+  def setup
+    super
+    @set = ROUTING::RouteSet.new
   end
 
   def request
-- 
cgit v1.2.3


From a3ca700c58fa59722288a12960c4a6cd1ade6aea Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Jul 2014 16:28:05 -0700
Subject: execute a request and check the path_parameters

This actually runs a request through the system, using the actual
routing methods as we would use in production, then tests the
path_parameters set on the request object.  The `recognize_path` method
isn't actually used in production, so testing what it returns isn't
useful.
---
 actionpack/test/controller/routing_test.rb | 76 +++++++++++++++++++++++-------
 1 file changed, 59 insertions(+), 17 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 9543787555..1c40e0e723 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1706,7 +1706,43 @@ class RouteSetTest < ActiveSupport::TestCase
     assert_equal '/ibocorp', url_for(set, { :controller => 'ibocorp', :action => "show", :page => 1 })
   end
 
+  include ActionDispatch::RoutingVerbs
+
+  class TestSet < ROUTING::RouteSet
+    def initialize(block)
+      @block = block
+      super()
+    end
+
+    class Dispatcher < ROUTING::RouteSet::Dispatcher
+      def initialize(defaults, set, block)
+        super(defaults)
+        @block = block
+        @set = set
+      end
+
+      def controller_reference(controller_param)
+        block = @block
+        set = @set
+        Class.new(ActionController::Base) {
+          include set.url_helpers
+          define_method(:process) { |name| block.call(self) }
+          def to_a; [200, {}, []]; end
+        }
+      end
+    end
+
+    def dispatcher defaults
+      TestSet::Dispatcher.new defaults, self, @block
+    end
+  end
+
+  alias :routes :set
+
   def test_generate_with_optional_params_recalls_last_request
+    controller = nil
+    @set = TestSet.new ->(c) { controller = c }
+
     set.draw do
       get "blog/", :controller => "blog", :action => "index"
 
@@ -1721,23 +1757,29 @@ class RouteSetTest < ActiveSupport::TestCase
       get "*anything", :controller => "blog", :action => "unknown_request"
     end
 
-    assert_equal({:controller => "blog", :action => "index"}, set.recognize_path("/blog"))
-    assert_equal({:controller => "blog", :action => "show", :id => "123"}, set.recognize_path("/blog/show/123"))
-    assert_equal({:controller => "blog", :action => "show_date", :year => "2004", :day => nil, :month => nil }, set.recognize_path("/blog/2004"))
-    assert_equal({:controller => "blog", :action => "show_date", :year => "2004", :month => "12", :day => nil }, set.recognize_path("/blog/2004/12"))
-    assert_equal({:controller => "blog", :action => "show_date", :year => "2004", :month => "12", :day => "25"}, set.recognize_path("/blog/2004/12/25"))
-    assert_equal({:controller => "articles", :action => "edit", :id => "123"}, set.recognize_path("/blog/articles/edit/123"))
-    assert_equal({:controller => "articles", :action => "show_stats"}, set.recognize_path("/blog/articles/show_stats"))
-    assert_equal({:controller => "blog", :action => "unknown_request", :anything => "blog/wibble"}, set.recognize_path("/blog/wibble"))
-    assert_equal({:controller => "blog", :action => "unknown_request", :anything => "junk"}, set.recognize_path("/junk"))
-
-    last_request = set.recognize_path("/blog/2006/07/28").freeze
-    assert_equal({:controller => "blog",  :action => "show_date", :year => "2006", :month => "07", :day => "28"}, last_request)
-    assert_equal("/blog/2006/07/25", url_for(set, { :day => 25 }, last_request))
-    assert_equal("/blog/2005",       url_for(set, { :year => 2005 }, last_request))
-    assert_equal("/blog/show/123",   url_for(set, { :action => "show" , :id => 123 }, last_request))
-    assert_equal("/blog/2006",       url_for(set, { :year => 2006 }, last_request))
-    assert_equal("/blog/2006",       url_for(set, { :year => 2006, :month => nil }, last_request))
+    recognize_path = ->(path) {
+      get(URI("http://example.org" + path))
+      controller.request.path_parameters
+    }
+
+    assert_equal({:controller => "blog", :action => "index"}, recognize_path.("/blog"))
+    assert_equal({:controller => "blog", :action => "show", :id => "123"}, recognize_path.("/blog/show/123"))
+    assert_equal({:controller => "blog", :action => "show_date", :year => "2004", :day => nil, :month => nil }, recognize_path.("/blog/2004"))
+    assert_equal({:controller => "blog", :action => "show_date", :year => "2004", :month => "12", :day => nil }, recognize_path.("/blog/2004/12"))
+    assert_equal({:controller => "blog", :action => "show_date", :year => "2004", :month => "12", :day => "25"}, recognize_path.("/blog/2004/12/25"))
+    assert_equal({:controller => "articles", :action => "edit", :id => "123"}, recognize_path.("/blog/articles/edit/123"))
+    assert_equal({:controller => "articles", :action => "show_stats"}, recognize_path.("/blog/articles/show_stats"))
+    assert_equal({:controller => "blog", :action => "unknown_request", :anything => "blog/wibble"}, recognize_path.("/blog/wibble"))
+    assert_equal({:controller => "blog", :action => "unknown_request", :anything => "junk"}, recognize_path.("/junk"))
+
+    get URI('http://example.org/blog/2006/07/28')
+
+    assert_equal({:controller => "blog",  :action => "show_date", :year => "2006", :month => "07", :day => "28"}, controller.request.path_parameters)
+    assert_equal("/blog/2006/07/25", controller.url_for({ :day => 25, :only_path => true }))
+    assert_equal("/blog/2005",       controller.url_for({ :year => 2005, :only_path => true }))
+    assert_equal("/blog/show/123",   controller.url_for({ :action => "show" , :id => 123, :only_path => true }))
+    assert_equal("/blog/2006",       controller.url_for({ :year => 2006, :only_path => true }))
+    assert_equal("/blog/2006",       controller.url_for({ :year => 2006, :month => nil, :only_path => true }))
   end
 
   private
-- 
cgit v1.2.3


From 8eb7bcb6e59e5720e3bd322511817804c8087043 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Jul 2014 15:02:36 -0700
Subject: stop calling url_for with recall parameters and actually use a
 request

---
 actionpack/test/abstract_unit.rb           |  77 ++++++++++-
 actionpack/test/controller/routing_test.rb | 205 +++++++++++++++++------------
 2 files changed, 197 insertions(+), 85 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 6584d20840..d027f1a88d 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -305,15 +305,44 @@ end
 
 module ActionDispatch
   module RoutingVerbs
-    def get(uri_or_host, path = nil)
+    def send_request(uri_or_host, method, path)
       host = uri_or_host.host unless path
       path ||= uri_or_host.path
 
       params = {'PATH_INFO'      => path,
-                'REQUEST_METHOD' => 'GET',
+                'REQUEST_METHOD' => method,
                 'HTTP_HOST'      => host}
 
-      routes.call(params)[2].join
+      routes.call(params)
+    end
+
+    def request_path_params(path, method: 'GET')
+      resp = send_request URI('http://localhost' + path), method.to_s.upcase, nil
+      status, headers, body = *resp
+      if status == 404
+        raise ActionController::RoutingError, "No route matches #{path.inspect}"
+      end
+      controller.request.path_parameters
+    end
+
+    def get(uri_or_host, path = nil)
+      send_request(uri_or_host, 'GET', path)[2].join
+    end
+
+    def post(uri_or_host, path = nil)
+      send_request(uri_or_host, 'POST', path)[2].join
+    end
+
+    def put(uri_or_host, path = nil)
+      send_request(uri_or_host, 'PUT', path)[2].join
+    end
+
+    def delete(uri_or_host, path = nil)
+      send_request(uri_or_host, 'DELETE', path)[2].join
+    end
+
+    def patch(uri_or_host, path = nil)
+      send_request(uri_or_host, 'PATCH', path)[2].join
     end
   end
 end
@@ -322,6 +351,48 @@ module RoutingTestHelpers
   def url_for(set, options, recall = {})
     set.url_for options.merge(:only_path => true, :_recall => recall)
   end
+
+  def make_set(strict = true)
+    tc = self
+    TestSet.new ->(c) { tc.controller = c }, strict
+  end
+
+  class TestSet < ActionDispatch::Routing::RouteSet
+    attr_reader :strict
+
+    def initialize(block, strict = false)
+      @block = block
+      @strict = strict
+      super()
+    end
+
+    class Dispatcher < ActionDispatch::Routing::RouteSet::Dispatcher
+      def initialize(defaults, set, block)
+        super(defaults)
+        @block = block
+        @set = set
+      end
+
+      def controller(params, default_controller=true)
+        super(params, @set.strict)
+      end
+
+      def controller_reference(controller_param)
+        block = @block
+        set = @set
+        super if @set.strict
+        Class.new(ActionController::Base) {
+          include set.url_helpers
+          define_method(:process) { |name| block.call(self) }
+          def to_a; [200, {}, []]; end
+        }
+      end
+    end
+
+    def dispatcher defaults
+      TestSet::Dispatcher.new defaults, self, @block
+    end
+  end
 end
 
 class ResourcesController < ActionController::Base
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 1c40e0e723..c18914cc8e 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -77,10 +77,11 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
   include ActionDispatch::RoutingVerbs
 
   attr_reader :rs
+  attr_accessor :controller
   alias :routes :rs
 
   def setup
-    @rs       = ::ActionDispatch::Routing::RouteSet.new
+    @rs = make_set
     @response = nil
   end
 
@@ -317,11 +318,16 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
 
     assert_equal '/admin/user/show/10', url_for(rs, { :controller => 'admin/user', :action => 'show', :id => 10 })
 
-    assert_equal '/admin/user/show',    url_for(rs, { :action => 'show' }, { :controller => 'admin/user', :action => 'list', :id => '10' })
-    assert_equal '/admin/user/list/10', url_for(rs, {}, { :controller => 'admin/user', :action => 'list', :id => '10' })
+    get URI('http://test.host/admin/user/list/10')
 
-    assert_equal '/admin/stuff', url_for(rs, { :controller => 'stuff' }, { :controller => 'admin/user', :action => 'list', :id => '10' })
-    assert_equal '/stuff',       url_for(rs, { :controller => '/stuff' }, { :controller => 'admin/user', :action => 'list', :id => '10' })
+    assert_equal({ :controller => 'admin/user', :action => 'list', :id => '10' },
+                 controller.request.path_parameters)
+
+    assert_equal '/admin/user/show',    controller.url_for({ :action => 'show', :only_path => true })
+    assert_equal '/admin/user/list/10', controller.url_for({:only_path => true})
+
+    assert_equal '/admin/stuff', controller.url_for({ :controller => 'stuff', :only_path => true })
+    assert_equal '/stuff', controller.url_for({ :controller => '/stuff', :only_path => true })
   end
 
   def test_ignores_leading_slash
@@ -518,9 +524,10 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
   def test_changing_controller
     rs.draw { get ':controller/:action/:id' }
 
+    get URI('http://test.host/admin/user/index/10')
+
     assert_equal '/admin/stuff/show/10',
-        url_for(rs, {:controller => 'stuff', :action => 'show', :id => 10},
-                    {:controller => 'admin/user', :action => 'index'})
+        controller.url_for({:controller => 'stuff', :action => 'show', :id => 10, :only_path => true})
   end
 
   def test_paths_escaped
@@ -579,8 +586,12 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
       get '*path' => 'content#show_file'
     end
 
+    get URI('http://test.host/pages/boo')
+    assert_equal({:controller=>"content", :action=>"show_file", :path=>"pages/boo"},
+                 controller.request.path_parameters)
+
     assert_equal '/pages/boo',
-        url_for(rs, {}, { :controller => 'content', :action => 'show_file', :path => %w(pages boo) })
+      controller.url_for(:only_path => true)
   end
 
   def test_backwards
@@ -589,7 +600,8 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
       get ':controller(/:action(/:id))'
     end
 
-    assert_equal '/page/20',   url_for(rs, { :id => 20 }, { :controller => 'pages', :action => 'show' })
+    get URI('http://test.host/pages/show')
+    assert_equal '/page/20',   controller.url_for({ :id => 20, :only_path => true })
     assert_equal '/page/20',   url_for(rs, { :controller => 'pages', :id => 20, :action => 'show' })
     assert_equal '/pages/boo', url_for(rs, { :controller => 'pages', :action => 'boo' })
   end
@@ -630,7 +642,8 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
 
   def test_action_expiry
     rs.draw { get ':controller(/:action(/:id))' }
-    assert_equal '/content', url_for(rs, { :controller => 'content' }, { :controller => 'content', :action => 'show' })
+    get URI('http://test.host/content/show')
+    assert_equal '/content', controller.url_for(:controller => 'content', :only_path => true)
   end
 
   def test_requirement_should_prevent_optional_id
@@ -673,14 +686,18 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     assert_equal '/pages/2005/6/12',
       url_for(rs, { :controller => 'content', :action => 'list_pages', :year => 2005, :month => 6, :day => 12 })
 
+    get URI('http://test.host/pages/2005/6/12')
+    assert_equal({ :controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12' },
+                controller.request.path_parameters)
+
     assert_equal '/pages/2005/6/4',
-      url_for(rs, { :day => 4 },   { :controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12' })
+      controller.url_for({ :day => 4, :only_path => true })
 
     assert_equal '/pages/2005/6',
-      url_for(rs, { :day => nil }, { :controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12' })
+      controller.url_for({ :day => nil, :only_path => true })
 
     assert_equal '/pages/2005',
-      url_for(rs, { :day => nil, :month => nil }, { :controller => 'content', :action => 'list_pages', :year => '2005', :month => '6', :day => '12' })
+      controller.url_for({ :day => nil, :month => nil, :only_path => true })
   end
 
   def test_root_url_generation_with_controller_and_action
@@ -838,12 +855,15 @@ end
 
 class RouteSetTest < ActiveSupport::TestCase
   include RoutingTestHelpers
+  include ActionDispatch::RoutingVerbs
 
   attr_reader :set
+  alias :routes :set
+  attr_accessor :controller
 
   def setup
     super
-    @set = ROUTING::RouteSet.new
+    @set = make_set
   end
 
   def request
@@ -944,7 +964,8 @@ class RouteSetTest < ActiveSupport::TestCase
       get '/admin/users' => 'admin/users#index', :as => "users"
     end
 
-    MockController.build(set.url_helpers).new
+    get URI('http://test.host/people')
+    controller
   end
 
   def test_named_route_url_method
@@ -1041,12 +1062,12 @@ class RouteSetTest < ActiveSupport::TestCase
       get '/:controller(/:action(/:id))'
     end
 
-    assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages'))
-    assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages/index'))
-    assert_equal({:controller => 'pages', :action => 'list'}, set.recognize_path('/pages/list'))
+    assert_equal({:controller => 'pages', :action => 'index'}, request_path_params('/pages'))
+    assert_equal({:controller => 'pages', :action => 'index'}, request_path_params('/pages/index'))
+    assert_equal({:controller => 'pages', :action => 'list'}, request_path_params('/pages/list'))
 
-    assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/pages/show/10'))
-    assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
+    assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, request_path_params('/pages/show/10'))
+    assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, request_path_params('/page/10'))
   end
 
   def test_route_constraints_on_request_object_with_anchors_are_valid
@@ -1098,9 +1119,7 @@ class RouteSetTest < ActiveSupport::TestCase
       get    "/people" => "missing#index"
     end
 
-    assert_raise(ActionController::RoutingError) {
-      set.recognize_path("/people", :method => :get)
-    }
+    assert_raises(ActionController::RoutingError) { request_path_params '/people' }
   end
 
   def test_recognize_with_encoded_id_and_regex
@@ -1108,8 +1127,8 @@ class RouteSetTest < ActiveSupport::TestCase
       get 'page/:id' => 'pages#show', :id => /[a-zA-Z0-9\+]+/
     end
 
-    assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
-    assert_equal({:controller => 'pages', :action => 'show', :id => 'hello+world'}, set.recognize_path('/page/hello+world'))
+    assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, request_path_params('/page/10'))
+    assert_equal({:controller => 'pages', :action => 'show', :id => 'hello+world'}, request_path_params('/page/hello+world'))
   end
 
   def test_recognize_with_http_methods
@@ -1122,40 +1141,40 @@ class RouteSetTest < ActiveSupport::TestCase
       delete "/people/:id" => "people#destroy"
     end
 
-    params = set.recognize_path("/people", :method => :get)
+    params = request_path_params("/people", :method => :get)
     assert_equal("index", params[:action])
 
-    params = set.recognize_path("/people", :method => :post)
+    params = request_path_params("/people", :method => :post)
     assert_equal("create", params[:action])
 
-    params = set.recognize_path("/people/5", :method => :put)
+    params = request_path_params("/people/5", :method => :put)
     assert_equal("update", params[:action])
 
-    params = set.recognize_path("/people/5", :method => :patch)
+    params = request_path_params("/people/5", :method => :patch)
     assert_equal("update", params[:action])
 
     assert_raise(ActionController::UnknownHttpMethod) {
-      set.recognize_path("/people", :method => :bacon)
+      request_path_params("/people", :method => :bacon)
     }
 
-    params = set.recognize_path("/people/5", :method => :get)
+    params = request_path_params("/people/5", :method => :get)
     assert_equal("show", params[:action])
     assert_equal("5", params[:id])
 
-    params = set.recognize_path("/people/5", :method => :put)
+    params = request_path_params("/people/5", :method => :put)
     assert_equal("update", params[:action])
     assert_equal("5", params[:id])
 
-    params = set.recognize_path("/people/5", :method => :patch)
+    params = request_path_params("/people/5", :method => :patch)
     assert_equal("update", params[:action])
     assert_equal("5", params[:id])
 
-    params = set.recognize_path("/people/5", :method => :delete)
+    params = request_path_params("/people/5", :method => :delete)
     assert_equal("destroy", params[:action])
     assert_equal("5", params[:id])
 
     assert_raise(ActionController::RoutingError) {
-      set.recognize_path("/people/5", :method => :post)
+      request_path_params("/people/5", :method => :post)
     }
   end
 
@@ -1165,11 +1184,11 @@ class RouteSetTest < ActiveSupport::TestCase
       root :to => "people#index"
     end
 
-    params = set.recognize_path("/people", :method => :get)
+    params = request_path_params("/people", :method => :get)
     assert_equal("people", params[:controller])
     assert_equal("index", params[:action])
 
-    params = set.recognize_path("/", :method => :get)
+    params = request_path_params("/", :method => :get)
     assert_equal("people", params[:controller])
     assert_equal("index", params[:action])
   end
@@ -1180,7 +1199,7 @@ class RouteSetTest < ActiveSupport::TestCase
              :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/
     end
 
-    params = set.recognize_path("/articles/2005/11/05/a-very-interesting-article", :method => :get)
+    params = request_path_params("/articles/2005/11/05/a-very-interesting-article", :method => :get)
     assert_equal("permalink", params[:action])
     assert_equal("2005", params[:year])
     assert_equal("11", params[:month])
@@ -1194,7 +1213,7 @@ class RouteSetTest < ActiveSupport::TestCase
       get '/profile' => 'profile#index'
     end
 
-    set.recognize_path("/profile") rescue nil
+    request_path_params("/profile") rescue nil
 
     assert !Object.const_defined?("Profiler__"), "Profiler should not be loaded"
   end
@@ -1207,17 +1226,17 @@ class RouteSetTest < ActiveSupport::TestCase
       get "people/:id(.:format)" => "people#show"
     end
 
-    params = set.recognize_path("/people/5", :method => :get)
+    params = request_path_params("/people/5", :method => :get)
     assert_equal("show", params[:action])
     assert_equal("5", params[:id])
 
-    params = set.recognize_path("/people/5", :method => :put)
+    params = request_path_params("/people/5", :method => :put)
     assert_equal("update", params[:action])
 
-    params = set.recognize_path("/people/5", :method => :patch)
+    params = request_path_params("/people/5", :method => :patch)
     assert_equal("update", params[:action])
 
-    params = set.recognize_path("/people/5.png", :method => :get)
+    params = request_path_params("/people/5.png", :method => :get)
     assert_equal("show", params[:action])
     assert_equal("5", params[:id])
     assert_equal("png", params[:format])
@@ -1236,7 +1255,7 @@ class RouteSetTest < ActiveSupport::TestCase
   def test_root_map
     set.draw { root :to => 'people#index' }
 
-    params = set.recognize_path("", :method => :get)
+    params = request_path_params("", :method => :get)
     assert_equal("people", params[:controller])
     assert_equal("index", params[:action])
   end
@@ -1250,7 +1269,7 @@ class RouteSetTest < ActiveSupport::TestCase
 
     end
 
-    params = set.recognize_path("/api/inventory", :method => :get)
+    params = request_path_params("/api/inventory", :method => :get)
     assert_equal("api/products", params[:controller])
     assert_equal("inventory", params[:action])
   end
@@ -1262,7 +1281,7 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    params = set.recognize_path("/api", :method => :get)
+    params = request_path_params("/api", :method => :get)
     assert_equal("api/products", params[:controller])
     assert_equal("index", params[:action])
   end
@@ -1274,7 +1293,7 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    params = set.recognize_path("/prefix/inventory", :method => :get)
+    params = request_path_params("/prefix/inventory", :method => :get)
     assert_equal("api/products", params[:controller])
     assert_equal("inventory", params[:action])
   end
@@ -1286,38 +1305,36 @@ class RouteSetTest < ActiveSupport::TestCase
       end
     end
 
-    params = set.recognize_path("/inventory", :method => :get)
+    params = request_path_params("/inventory", :method => :get)
     assert_equal("api/products", params[:controller])
     assert_equal("inventory", params[:action])
   end
 
-  def test_generate_changes_controller_module
-    set.draw { get ':controller/:action/:id' }
-    current = { :controller => "bling/bloop", :action => "bap", :id => 9 }
-
-    assert_equal "/foo/bar/baz/7",
-        url_for(set, { :controller => "foo/bar", :action => "baz", :id => 7 }, current)
-  end
-
   def test_id_is_sticky_when_it_ought_to_be
+    @set = make_set false
+
     set.draw do
       get ':controller/:id/:action'
     end
 
-    url = url_for(set, { :action => "destroy" }, { :controller => "people", :action => "show", :id => "7" })
-    assert_equal "/people/7/destroy", url
+    get URI('http://test.host/people/7/show')
+
+    assert_equal "/people/7/destroy", controller.url_for(:action => 'destroy', :only_path => true)
   end
 
   def test_use_static_path_when_possible
+    @set = make_set false
+
     set.draw do
       get 'about' => "welcome#about"
       get ':controller/:action/:id'
     end
 
-    url = url_for(set, { :controller => "welcome", :action => "about" },
-      { :controller => "welcome", :action => "get", :id => "7" })
+    get URI('http://test.host/welcom/get/7')
 
-    assert_equal "/about", url
+    assert_equal "/about", controller.url_for(:controller => 'welcome',
+                                              :action => 'about',
+                                              :only_path => true)
   end
 
   def test_generate
@@ -1352,38 +1369,51 @@ class RouteSetTest < ActiveSupport::TestCase
   end
 
   def test_named_routes_are_never_relative_to_modules
+    @set = make_set false
+
     set.draw do
       get "/connection/manage(/:action)" => 'connection/manage#index'
       get "/connection/connection" => "connection/connection#index"
       get '/connection' => 'connection#index', :as => 'family_connection'
     end
 
-    url = url_for(set, { :controller => "connection" }, { :controller => 'connection/manage' })
+    assert_equal({ :controller => 'connection/manage',
+                   :action => 'index', }, request_path_params('/connection/manage'))
+
+    url = controller.url_for({ :controller => "connection", :only_path => true })
     assert_equal "/connection/connection", url
 
-    url = url_for(set, { :use_route => :family_connection, :controller => "connection" }, { :controller => 'connection/manage' })
+    url = controller.url_for({ :use_route => :family_connection,
+                               :controller => "connection", :only_path => true })
     assert_equal "/connection", url
   end
 
   def test_action_left_off_when_id_is_recalled
+    @set = make_set false
+
     set.draw do
       get ':controller(/:action(/:id))'
     end
-    assert_equal '/books', url_for(set,
-      {:controller => 'books', :action => 'index'},
-      {:controller => 'books', :action => 'show', :id => '10'}
-    )
+
+    get URI('http://test.host/books/show/10')
+
+    assert_equal '/books', controller.url_for(:controller => 'books',
+                                              :only_path => true,
+                                              :action => 'index')
   end
 
   def test_query_params_will_be_shown_when_recalled
+    @set = make_set false
+
     set.draw do
       get 'show_weblog/:parameter' => 'weblog#show'
       get ':controller(/:action(/:id))'
     end
-    assert_equal '/weblog/edit?parameter=1', url_for(set,
-      {:action => 'edit', :parameter => 1},
-      {:controller => 'weblog', :action => 'show', :parameter => 1}
-    )
+
+    get URI('http://test.host/weblog/show/1')
+
+    assert_equal '/weblog/edit?parameter=1', controller.url_for(
+      {:action => 'edit', :parameter => 1, :only_path => true})
   end
 
   def test_format_is_not_inherit
@@ -1391,22 +1421,30 @@ class RouteSetTest < ActiveSupport::TestCase
       get '/posts(.:format)' => 'posts#index'
     end
 
-    assert_equal '/posts', url_for(set,
-      {:controller => 'posts'},
-      {:controller => 'posts', :action => 'index', :format => 'xml'}
-    )
+    get URI('http://test.host/posts.xml')
+    assert_equal({:controller => 'posts', :action => 'index', :format => 'xml'},
+                 controller.request.path_parameters)
+
+    assert_equal '/posts', controller.url_for(
+      {:controller => 'posts', :only_path => true})
 
-    assert_equal '/posts.xml', url_for(set,
-      {:controller => 'posts', :format => 'xml'},
-      {:controller => 'posts', :action => 'index', :format => 'xml'}
-    )
+    assert_equal '/posts.xml', controller.url_for(
+      {:controller => 'posts', :format => 'xml', :only_path => true})
   end
 
   def test_expiry_determination_should_consider_values_with_to_param
+    @set = make_set false
+
     set.draw { get 'projects/:project_id/:controller/:action' }
-    assert_equal '/projects/1/weblog/show', url_for(set,
-      { :action => 'show', :project_id => 1 },
-      { :controller => 'weblog', :action => 'show', :project_id => '1' })
+
+    get URI('http://test.host/projects/1/weblog/show')
+
+    assert_equal(
+      { :controller => 'weblog', :action => 'show', :project_id => '1' },
+      controller.request.path_parameters)
+
+    assert_equal '/projects/1/weblog/show',
+      controller.url_for({ :action => 'show', :project_id => 1, :only_path => true })
   end
 
   def test_named_route_in_nested_resource
@@ -1852,6 +1890,9 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
     root :to => "news#index"
   }
 
+  attr_reader :routes
+  attr_reader :controller
+
   def setup
     @routes = ActionDispatch::Routing::RouteSet.new
     @routes.draw(&Mapping)
-- 
cgit v1.2.3


From 3ef98a1439aa3009f3c641652e2f19e3522543fb Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 15 Jul 2014 15:24:23 -0700
Subject: fix warnings

---
 actionpack/test/abstract_unit.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index d027f1a88d..59a23a5e4b 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -318,7 +318,7 @@ module ActionDispatch
 
     def request_path_params(path, method: 'GET')
       resp = send_request URI('http://localhost' + path), method.to_s.upcase, nil
-      status, headers, body = *resp
+      status = resp.first
       if status == 404
         raise ActionController::RoutingError, "No route matches #{path.inspect}"
       end
-- 
cgit v1.2.3


From f3c1832ad44e5e8b256e5548623a445a83b09c1f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Jul 2014 15:55:25 -0700
Subject: stop passing recall to url_for

---
 actionpack/test/abstract_unit.rb                   |  4 +-
 .../test/controller/url_for_integration_test.rb    | 81 ++++++++++++----------
 2 files changed, 48 insertions(+), 37 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 59a23a5e4b..a427bd5191 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -348,8 +348,8 @@ module ActionDispatch
 end
 
 module RoutingTestHelpers
-  def url_for(set, options, recall = {})
-    set.url_for options.merge(:only_path => true, :_recall => recall)
+  def url_for(set, options)
+    set.url_for options.merge(:only_path => true)
   end
 
   def make_set(strict = true)
diff --git a/actionpack/test/controller/url_for_integration_test.rb b/actionpack/test/controller/url_for_integration_test.rb
index 6c2311e7a5..24a09222b1 100644
--- a/actionpack/test/controller/url_for_integration_test.rb
+++ b/actionpack/test/controller/url_for_integration_test.rb
@@ -6,6 +6,7 @@ require 'active_support/core_ext/object/with_options'
 module ActionPack
   class URLForIntegrationTest < ActiveSupport::TestCase
     include RoutingTestHelpers
+    include ActionDispatch::RoutingVerbs
 
     Model = Struct.new(:to_param)
 
@@ -61,8 +62,11 @@ module ActionPack
       root :to => "news#index"
     }
 
+    attr_reader :routes
+    attr_accessor :controller
+
     def setup
-      @routes = ActionDispatch::Routing::RouteSet.new
+      @routes = make_set false
       @routes.draw(&Mapping)
     end
 
@@ -70,9 +74,9 @@ module ActionPack
       ['/admin/users',[ { :use_route => 'admin_users' }]],
       ['/admin/users',[ { :controller => 'admin/users' }]],
       ['/admin/users',[ { :controller => 'admin/users', :action => 'index' }]],
-      ['/admin/users',[ { :action => 'index' }, { :controller => 'admin/users' }]],
-      ['/admin/users',[ { :controller => 'users', :action => 'index' }, { :controller => 'admin/accounts' }]],
-      ['/people',[      { :controller => '/people', :action => 'index' }, { :controller => 'admin/accounts' }]],
+      ['/admin/users',[ { :action => 'index' }, { :controller => 'admin/users', :action => 'index' }, '/admin/users']],
+      ['/admin/users',[ { :controller => 'users', :action => 'index' }, { :controller => 'admin/accounts', :action => 'show', :id => '1' }, '/admin/accounts/show/1']],
+      ['/people',[      { :controller => '/people', :action => 'index' }, {:controller=>"admin/accounts", :action=>"foo", :id=>"bar"}, '/admin/accounts/foo/bar']],
 
       ['/admin/posts',[     { :controller => 'admin/posts' }]],
       ['/admin/posts/new',[ { :controller => 'admin/posts', :action => 'new' }]],
@@ -86,11 +90,11 @@ module ActionPack
       ['/archive?year=january',[ { :controller => 'archive', :action => 'index', :year => 'january' }]],
 
       ['/people',[ { :controller => 'people', :action => 'index' }]],
-      ['/people',[ { :action => 'index' }, { :controller => 'people' }]],
-      ['/people',[ { :action => 'index' }, { :controller => 'people', :action => 'show', :id => '1' }]],
-      ['/people',[ { :controller => 'people', :action => 'index' }, { :controller => 'people', :action => 'show', :id => '1' }]],
-      ['/people',[ {}, { :controller => 'people', :action => 'index' }]],
-      ['/people/1',[   { :controller => 'people', :action => 'show' }, { :controller => 'people', :action => 'show', :id => '1' }]],
+      ['/people',[ { :action => 'index' }, { :controller => 'people', :action => 'index' }, '/people']],
+      ['/people',[ { :action => 'index' }, { :controller => 'people', :action => 'show', :id => '1' }, '/people/show/1']],
+      ['/people',[ { :controller => 'people', :action => 'index' }, { :controller => 'people', :action => 'show', :id => '1' }, '/people/show/1']],
+      ['/people',[ {}, { :controller => 'people', :action => 'index' }, '/people']],
+      ['/people/1',[   { :controller => 'people', :action => 'show' }, { :controller => 'people', :action => 'show', :id => '1' }, '/people/show/1']],
       ['/people/new',[ { :use_route => 'new_person' }]],
       ['/people/new',[ { :controller => 'people', :action => 'new' }]],
       ['/people/1',[   { :use_route => 'person', :id => '1' }]],
@@ -98,11 +102,11 @@ module ActionPack
       ['/people/1.xml',[ { :controller => 'people', :action => 'show', :id => '1', :format => 'xml' }]],
       ['/people/1',[ { :controller => 'people', :action => 'show', :id => 1 }]],
       ['/people/1',[ { :controller => 'people', :action => 'show', :id => Model.new('1') }]],
-      ['/people/1',[ { :action => 'show', :id => '1' }, { :controller => 'people', :action => 'index' }]],
-      ['/people/1',[ { :action => 'show', :id => 1 }, { :controller => 'people', :action => 'show', :id => '1' }]],
-      ['/people',[   { :controller => 'people', :action => 'index' }, { :controller => 'people', :action => 'show', :id => '1' }]],
-      ['/people/1',[ {}, { :controller => 'people', :action => 'show', :id => '1' }]],
-      ['/people/1',[ { :controller => 'people', :action => 'show' }, { :controller => 'people', :action => 'index', :id => '1' }]],
+      ['/people/1',[ { :action => 'show', :id => '1' }, { :controller => 'people', :action => 'index' }, '/people']],
+      ['/people/1',[ { :action => 'show', :id => 1 }, { :controller => 'people', :action => 'show', :id => '1' }, '/people/show/1']],
+      ['/people',[   { :controller => 'people', :action => 'index' }, { :controller => 'people', :action => 'show', :id => '1' }, '/people/show/1']],
+      ['/people/1',[ {}, { :controller => 'people', :action => 'show', :id => '1' }, '/people/show/1']],
+      ['/people/1',[ { :controller => 'people', :action => 'show' }, { :controller => 'people', :action => 'index', :id => '1' }, '/people/index/1']],
       ['/people/1/edit',[     { :controller => 'people', :action => 'edit', :id => '1' }]],
       ['/people/1/edit.xml',[ { :controller => 'people', :action => 'edit', :id => '1', :format => 'xml' }]],
       ['/people/1/edit',[     { :use_route => 'edit_person', :id => '1' }]],
@@ -118,16 +122,15 @@ module ActionPack
 
       ['/project',[    { :controller => 'project', :action => 'index' }]],
       ['/projects/1',[ { :controller => 'project', :action => 'index', :project_id => '1' }]],
-      ['/projects/1',[ { :controller => 'project', :action => 'index'}, {:project_id => '1' }]],
+      ['/projects/1',[ { :controller => 'project', :action => 'index'}, {:project_id => '1', :controller => 'project', :action => 'index' }, '/projects/1']],
       ['/projects/1',[ { :use_route => 'project', :controller => 'project', :action => 'index', :project_id => '1' }]],
-      ['/projects/1',[ { :use_route => 'project', :controller => 'project', :action => 'index' }, { :project_id => '1' }]],
+      ['/projects/1',[ { :use_route => 'project', :controller => 'project', :action => 'index' }, { :controller => 'project', :action => 'index', :project_id => '1' }, '/projects/1']],
 
       ['/clients',[ { :controller => 'projects', :action => 'index' }]],
       ['/clients?project_id=1',[ { :controller => 'projects', :action => 'index', :project_id => '1' }]],
-      ['/clients',[ { :controller => 'projects', :action => 'index' }, { :project_id => '1' }]],
-      ['/clients',[ { :action => 'index' }, { :controller => 'projects', :action => 'index', :project_id => '1' }]],
+      ['/clients',[ { :controller => 'projects', :action => 'index' }, { :project_id => '1', :controller => 'project', :action => 'index' }, '/projects/1']],
 
-      ['/comment/20',[   { :id => 20 }, { :controller => 'comments', :action => 'show' }]],
+      ['/comment/20',[   { :id => 20 }, { :controller => 'comments', :action => 'show' }, '/comments/show']],
       ['/comment/20',[   { :controller => 'comments', :id => 20, :action => 'show' }]],
       ['/comments/boo',[ { :controller => 'comments', :action => 'boo' }]],
 
@@ -144,24 +147,21 @@ module ActionPack
       ['/notes',[         { :page_id => nil, :controller => 'notes' }]],
       ['/notes',[         { :controller => 'notes' }]],
       ['/notes/print',[   { :controller => 'notes', :action => 'print' }]],
-      ['/notes/print',[   {}, { :controller => 'notes', :action => 'print' }]],
-
-      ['/notes/index/1',[ { :controller => 'notes' }, { :controller => 'notes', :id => '1' }]],
-      ['/notes/index/1',[ { :controller => 'notes' }, { :controller => 'notes', :id => '1', :foo => 'bar' }]],
-      ['/notes/index/1',[ { :controller => 'notes' }, { :controller => 'notes', :id => '1' }]],
-      ['/notes/index/1',[ { :action => 'index' }, { :controller => 'notes', :id => '1' }]],
-      ['/notes/index/1',[ {}, { :controller => 'notes', :id => '1' }]],
-      ['/notes/show/1',[  {}, { :controller => 'notes', :action => 'show', :id => '1' }]],
-      ['/notes/index/1',[ { :controller => 'notes', :id => '1' }, { :foo => 'bar' }]],
-      ['/posts',[      { :controller => 'posts' }, { :controller => 'notes', :action => 'show', :id => '1' }]],
-      ['/notes/list',[ { :action => 'list' }, { :controller => 'notes', :action => 'show', :id => '1' }]],
+      ['/notes/print',[   {}, { :controller => 'notes', :action => 'print' }, '/notes/print']],
+
+      ['/notes/index/1',[ { :controller => 'notes' }, { :controller => 'notes', :action => 'index', :id => '1' }, '/notes/index/1']],
+      ['/notes/index/1',[ { :controller => 'notes' }, { :controller => 'notes', :id => '1', :action => 'index' }, '/notes/index/1']],
+      ['/notes/index/1',[ { :action => 'index' }, { :controller => 'notes', :id => '1', :action => 'index' }, '/notes/index/1']],
+      ['/notes/index/1',[ {}, { :controller => 'notes', :id => '1', :action => 'index' }, '/notes/index/1']],
+      ['/notes/show/1',[  {}, { :controller => 'notes', :action => 'show', :id => '1' }, '/notes/show/1']],
+      ['/posts',[      { :controller => 'posts' }, { :controller => 'notes', :action => 'show', :id => '1' }, '/notes/show/1']],
+      ['/notes/list',[ { :action => 'list' }, { :controller => 'notes', :action => 'show', :id => '1' }, '/notes/show/1']],
 
       ['/posts/ping',[    { :controller => 'posts', :action => 'ping' }]],
       ['/posts/show/1',[  { :controller => 'posts', :action => 'show', :id => '1' }]],
       ['/posts',[         { :controller => 'posts' }]],
       ['/posts',[         { :controller => 'posts', :action => 'index' }]],
-      ['/posts',[         { :controller => 'posts' }, { :controller => 'posts', :action => 'index' }]],
-      ['/posts/create',[  { :action => 'create' }, { :controller => 'posts' }]],
+      ['/posts/create',[  { :action => 'create' }, {:day=>nil, :month=>nil, :controller=>"posts", :action=>"show_date"}, '/blog']],
       ['/posts?foo=bar',[ { :controller => 'posts', :foo => 'bar' }]],
       ['/posts?foo%5B%5D=bar&foo%5B%5D=baz', [{ :controller => 'posts', :foo => ['bar', 'baz'] }]],
       ['/posts?page=2',  [{ :controller => 'posts', :page => 2 }]],
@@ -169,9 +169,20 @@ module ActionPack
 
       ['/news.rss', [{ :controller => 'news', :action => 'index', :format => 'rss' }]],
     ].each_with_index do |(url, params), i|
-    define_method("test_#{url.gsub(/\W/, '_')}_#{i}") do
-      assert_equal url, url_for(@routes, *params), params.inspect
-    end
+      if params.length > 1
+        hash, path_params, route = *params
+        hash[:only_path] = true
+
+        define_method("test_#{url.gsub(/\W/, '_')}_#{i}") do
+          get URI('http://test.host' + route.to_s)
+          assert_equal path_params, controller.request.path_parameters
+          assert_equal url, controller.url_for(hash), params.inspect
+        end
+      else
+        define_method("test_#{url.gsub(/\W/, '_')}_#{i}") do
+          assert_equal url, url_for(@routes, params.first), params.inspect
+        end
+      end
     end
   end
 end
-- 
cgit v1.2.3


From 993ca82d709190e47a9a0bc4bda3d16fb85593fe Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 15 Jul 2014 18:20:27 -0700
Subject: fix for 1.9 kwargs syntax

---
 actionpack/test/abstract_unit.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index a427bd5191..cdf09d41eb 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -316,7 +316,8 @@ module ActionDispatch
       routes.call(params)
     end
 
-    def request_path_params(path, method: 'GET')
+    def request_path_params(path, method:)
+      method ||= 'GET'
       resp = send_request URI('http://localhost' + path), method.to_s.upcase, nil
       status = resp.first
       if status == 404
-- 
cgit v1.2.3


From 7880f39e1d82cd4faf3dc61928c22b385ced3d50 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 15 Jul 2014 18:43:47 -0700
Subject: Fix 1.9. uggghhhhhh get it together @tenderlove :bomb:

---
 actionpack/test/abstract_unit.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index cdf09d41eb..47d968982c 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -316,8 +316,8 @@ module ActionDispatch
       routes.call(params)
     end
 
-    def request_path_params(path, method:)
-      method ||= 'GET'
+    def request_path_params(path, options = {})
+      method = options[:method] || 'GET'
       resp = send_request URI('http://localhost' + path), method.to_s.upcase, nil
       status = resp.first
       if status == 404
-- 
cgit v1.2.3


From 341698ed40e023898d9f9d1f5c163d4d2cab4832 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 16 Jul 2014 12:21:46 -0300
Subject: Don't accept parameters as argument for redirect to [via @homakov]

Closes #16170
---
 actionpack/test/controller/redirect_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 4331333b98..103ca9c776 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -90,6 +90,10 @@ class RedirectController < ActionController::Base
     redirect_to nil
   end
 
+  def redirect_to_params
+    redirect_to ActionController::Parameters.new(status: 200, protocol: 'javascript', f: '%0Aeval(name)')
+  end
+
   def redirect_to_with_block
     redirect_to proc { "http://www.rubyonrails.org/" }
   end
@@ -281,6 +285,12 @@ class RedirectTest < ActionController::TestCase
     end
   end
 
+  def test_redirect_to_params
+    assert_raise(ActionController::ActionControllerError) do
+      get :redirect_to_params
+    end
+  end
+
   def test_redirect_to_with_block
     get :redirect_to_with_block
     assert_response :redirect
-- 
cgit v1.2.3


From 6947e3a2b57b62e1d6bd24082faa125973bbc388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 16 Jul 2014 14:09:01 -0300
Subject: Remove unused fixtures

These fixtures are not used in actionpack tests.
---
 actionpack/test/fixtures/test/_changing_priority.html.erb   |  1 -
 actionpack/test/fixtures/test/_changing_priority.json.erb   |  1 -
 actionpack/test/fixtures/test/_counter.html.erb             |  1 -
 actionpack/test/fixtures/test/_customer.erb                 |  1 -
 actionpack/test/fixtures/test/_customer_counter.erb         |  1 -
 actionpack/test/fixtures/test/_customer_counter_with_as.erb |  1 -
 actionpack/test/fixtures/test/_customer_greeting.erb        |  1 -
 actionpack/test/fixtures/test/_customer_with_var.erb        |  1 -
 .../fixtures/test/_directory/_partial_with_locales.html.erb |  1 -
 actionpack/test/fixtures/test/_first_json_partial.json.erb  |  1 -
 actionpack/test/fixtures/test/_form.erb                     |  1 -
 actionpack/test/fixtures/test/_hash_greeting.erb            |  1 -
 actionpack/test/fixtures/test/_hash_object.erb              |  2 --
 actionpack/test/fixtures/test/_hello.builder                |  1 -
 .../test/fixtures/test/_json_change_priority.json.erb       |  0
 actionpack/test/fixtures/test/_labelling_form.erb           |  1 -
 actionpack/test/fixtures/test/_layout_for_partial.html.erb  |  3 ---
 .../test/fixtures/test/_partial_for_use_in_layout.html.erb  |  1 -
 actionpack/test/fixtures/test/_partial_html_erb.html.erb    |  1 -
 .../test/fixtures/test/_partial_name_local_variable.erb     |  1 -
 actionpack/test/fixtures/test/_partial_only.erb             |  1 -
 actionpack/test/fixtures/test/_partial_only_html.html       |  1 -
 actionpack/test/fixtures/test/_partial_with_partial.erb     |  2 --
 actionpack/test/fixtures/test/_person.erb                   |  2 --
 actionpack/test/fixtures/test/_raise_indentation.html.erb   | 13 -------------
 actionpack/test/fixtures/test/_second_json_partial.json.erb |  1 -
 actionpack/test/fixtures/test/action_talk_to_layout.erb     |  2 --
 .../test/fixtures/test/calling_partial_with_layout.html.erb |  1 -
 actionpack/test/fixtures/test/capturing.erb                 |  4 ----
 actionpack/test/fixtures/test/change_priority.html.erb      |  2 --
 actionpack/test/fixtures/test/content_for.erb               |  1 -
 actionpack/test/fixtures/test/content_for_concatenated.erb  |  3 ---
 .../test/fixtures/test/content_for_with_parameter.erb       |  2 --
 actionpack/test/fixtures/test/formatted_html_erb.html.erb   |  1 -
 actionpack/test/fixtures/test/greeting.html.erb             |  1 -
 actionpack/test/fixtures/test/greeting.xml.erb              |  1 -
 actionpack/test/fixtures/test/hello,world.erb               |  1 -
 actionpack/test/fixtures/test/hello.builder                 |  4 ----
 actionpack/test/fixtures/test/hello_world_container.builder |  3 ---
 actionpack/test/fixtures/test/hello_world_from_rxml.builder |  3 ---
 .../test/fixtures/test/hello_world_with_layout_false.erb    |  1 -
 actionpack/test/fixtures/test/html_template.html.erb        |  1 -
 actionpack/test/fixtures/test/hyphen-ated.erb               |  1 -
 actionpack/test/fixtures/test/list.erb                      |  1 -
 .../test/fixtures/test/non_erb_block_content_for.builder    |  4 ----
 actionpack/test/fixtures/test/potential_conflicts.erb       |  4 ----
 actionpack/test/fixtures/test/proper_block_detection.erb    |  1 -
 .../test/fixtures/test/render_file_from_template.html.erb   |  1 -
 .../fixtures/test/render_file_with_locals_and_default.erb   |  1 -
 ...nder_implicit_html_template_from_xhr_request.da.html.erb |  1 -
 .../render_implicit_html_template_from_xhr_request.html.erb |  1 -
 .../test/render_implicit_js_template_without_layout.js.erb  |  1 -
 .../fixtures/test/render_partial_inside_directory.html.erb  |  1 -
 actionpack/test/fixtures/test/render_to_string_test.erb     |  1 -
 actionpack/test/fixtures/test/render_two_partials.html.erb  |  2 --
 .../test/fixtures/test/using_layout_around_block.html.erb   |  1 -
 actionpack/test/fixtures/test/with_html_partial.html.erb    |  1 -
 actionpack/test/fixtures/test/with_partial.html.erb         |  1 -
 actionpack/test/fixtures/test/with_partial.text.erb         |  1 -
 actionpack/test/fixtures/test/with_xml_template.html.erb    |  1 -
 60 files changed, 98 deletions(-)
 delete mode 100644 actionpack/test/fixtures/test/_changing_priority.html.erb
 delete mode 100644 actionpack/test/fixtures/test/_changing_priority.json.erb
 delete mode 100644 actionpack/test/fixtures/test/_counter.html.erb
 delete mode 100644 actionpack/test/fixtures/test/_customer.erb
 delete mode 100644 actionpack/test/fixtures/test/_customer_counter.erb
 delete mode 100644 actionpack/test/fixtures/test/_customer_counter_with_as.erb
 delete mode 100644 actionpack/test/fixtures/test/_customer_greeting.erb
 delete mode 100644 actionpack/test/fixtures/test/_customer_with_var.erb
 delete mode 100644 actionpack/test/fixtures/test/_directory/_partial_with_locales.html.erb
 delete mode 100644 actionpack/test/fixtures/test/_first_json_partial.json.erb
 delete mode 100644 actionpack/test/fixtures/test/_form.erb
 delete mode 100644 actionpack/test/fixtures/test/_hash_greeting.erb
 delete mode 100644 actionpack/test/fixtures/test/_hash_object.erb
 delete mode 100644 actionpack/test/fixtures/test/_hello.builder
 delete mode 100644 actionpack/test/fixtures/test/_json_change_priority.json.erb
 delete mode 100644 actionpack/test/fixtures/test/_labelling_form.erb
 delete mode 100644 actionpack/test/fixtures/test/_layout_for_partial.html.erb
 delete mode 100644 actionpack/test/fixtures/test/_partial_for_use_in_layout.html.erb
 delete mode 100644 actionpack/test/fixtures/test/_partial_html_erb.html.erb
 delete mode 100644 actionpack/test/fixtures/test/_partial_name_local_variable.erb
 delete mode 100644 actionpack/test/fixtures/test/_partial_only.erb
 delete mode 100644 actionpack/test/fixtures/test/_partial_only_html.html
 delete mode 100644 actionpack/test/fixtures/test/_partial_with_partial.erb
 delete mode 100644 actionpack/test/fixtures/test/_person.erb
 delete mode 100644 actionpack/test/fixtures/test/_raise_indentation.html.erb
 delete mode 100644 actionpack/test/fixtures/test/_second_json_partial.json.erb
 delete mode 100644 actionpack/test/fixtures/test/action_talk_to_layout.erb
 delete mode 100644 actionpack/test/fixtures/test/calling_partial_with_layout.html.erb
 delete mode 100644 actionpack/test/fixtures/test/capturing.erb
 delete mode 100644 actionpack/test/fixtures/test/change_priority.html.erb
 delete mode 100644 actionpack/test/fixtures/test/content_for.erb
 delete mode 100644 actionpack/test/fixtures/test/content_for_concatenated.erb
 delete mode 100644 actionpack/test/fixtures/test/content_for_with_parameter.erb
 delete mode 100644 actionpack/test/fixtures/test/formatted_html_erb.html.erb
 delete mode 100644 actionpack/test/fixtures/test/greeting.html.erb
 delete mode 100644 actionpack/test/fixtures/test/greeting.xml.erb
 delete mode 100644 actionpack/test/fixtures/test/hello,world.erb
 delete mode 100644 actionpack/test/fixtures/test/hello.builder
 delete mode 100644 actionpack/test/fixtures/test/hello_world_container.builder
 delete mode 100644 actionpack/test/fixtures/test/hello_world_from_rxml.builder
 delete mode 100644 actionpack/test/fixtures/test/hello_world_with_layout_false.erb
 delete mode 100644 actionpack/test/fixtures/test/html_template.html.erb
 delete mode 100644 actionpack/test/fixtures/test/hyphen-ated.erb
 delete mode 100644 actionpack/test/fixtures/test/list.erb
 delete mode 100644 actionpack/test/fixtures/test/non_erb_block_content_for.builder
 delete mode 100644 actionpack/test/fixtures/test/potential_conflicts.erb
 delete mode 100644 actionpack/test/fixtures/test/proper_block_detection.erb
 delete mode 100644 actionpack/test/fixtures/test/render_file_from_template.html.erb
 delete mode 100644 actionpack/test/fixtures/test/render_file_with_locals_and_default.erb
 delete mode 100644 actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb
 delete mode 100644 actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb
 delete mode 100644 actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb
 delete mode 100644 actionpack/test/fixtures/test/render_partial_inside_directory.html.erb
 delete mode 100644 actionpack/test/fixtures/test/render_to_string_test.erb
 delete mode 100644 actionpack/test/fixtures/test/render_two_partials.html.erb
 delete mode 100644 actionpack/test/fixtures/test/using_layout_around_block.html.erb
 delete mode 100644 actionpack/test/fixtures/test/with_html_partial.html.erb
 delete mode 100644 actionpack/test/fixtures/test/with_partial.html.erb
 delete mode 100644 actionpack/test/fixtures/test/with_partial.text.erb
 delete mode 100644 actionpack/test/fixtures/test/with_xml_template.html.erb

(limited to 'actionpack/test')

diff --git a/actionpack/test/fixtures/test/_changing_priority.html.erb b/actionpack/test/fixtures/test/_changing_priority.html.erb
deleted file mode 100644
index 3225efc49a..0000000000
--- a/actionpack/test/fixtures/test/_changing_priority.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-HTML
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_changing_priority.json.erb b/actionpack/test/fixtures/test/_changing_priority.json.erb
deleted file mode 100644
index 7fa41dce66..0000000000
--- a/actionpack/test/fixtures/test/_changing_priority.json.erb
+++ /dev/null
@@ -1 +0,0 @@
-JSON
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_counter.html.erb b/actionpack/test/fixtures/test/_counter.html.erb
deleted file mode 100644
index fd245bfc70..0000000000
--- a/actionpack/test/fixtures/test/_counter.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= counter_counter %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer.erb b/actionpack/test/fixtures/test/_customer.erb
deleted file mode 100644
index d8220afeda..0000000000
--- a/actionpack/test/fixtures/test/_customer.erb
+++ /dev/null
@@ -1 +0,0 @@
-Hello: <%= customer.name rescue "Anonymous" %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer_counter.erb b/actionpack/test/fixtures/test/_customer_counter.erb
deleted file mode 100644
index 3435979dba..0000000000
--- a/actionpack/test/fixtures/test/_customer_counter.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= customer_counter.name %><%= customer_counter_counter %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer_counter_with_as.erb b/actionpack/test/fixtures/test/_customer_counter_with_as.erb
deleted file mode 100644
index 1241eb604d..0000000000
--- a/actionpack/test/fixtures/test/_customer_counter_with_as.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= client.name %><%= client_counter %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer_greeting.erb b/actionpack/test/fixtures/test/_customer_greeting.erb
deleted file mode 100644
index 6acbcb20c4..0000000000
--- a/actionpack/test/fixtures/test/_customer_greeting.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= greeting %>: <%= customer_greeting.name %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer_with_var.erb b/actionpack/test/fixtures/test/_customer_with_var.erb
deleted file mode 100644
index 00047dd20e..0000000000
--- a/actionpack/test/fixtures/test/_customer_with_var.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= customer.name %> <%= customer.name %> <%= customer.name %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_directory/_partial_with_locales.html.erb b/actionpack/test/fixtures/test/_directory/_partial_with_locales.html.erb
deleted file mode 100644
index 1cc8d41475..0000000000
--- a/actionpack/test/fixtures/test/_directory/_partial_with_locales.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-Hello <%= name %>
diff --git a/actionpack/test/fixtures/test/_first_json_partial.json.erb b/actionpack/test/fixtures/test/_first_json_partial.json.erb
deleted file mode 100644
index 790ee896db..0000000000
--- a/actionpack/test/fixtures/test/_first_json_partial.json.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => "test/second_json_partial" %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_form.erb b/actionpack/test/fixtures/test/_form.erb
deleted file mode 100644
index 01107f1cb2..0000000000
--- a/actionpack/test/fixtures/test/_form.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= form.label :title %>
diff --git a/actionpack/test/fixtures/test/_hash_greeting.erb b/actionpack/test/fixtures/test/_hash_greeting.erb
deleted file mode 100644
index fc54a36f2a..0000000000
--- a/actionpack/test/fixtures/test/_hash_greeting.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= greeting %>: <%= hash_greeting[:first_name] %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_hash_object.erb b/actionpack/test/fixtures/test/_hash_object.erb
deleted file mode 100644
index 34a92c6a56..0000000000
--- a/actionpack/test/fixtures/test/_hash_object.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= hash_object[:first_name] %>
-<%= hash_object[:first_name].reverse %>
diff --git a/actionpack/test/fixtures/test/_hello.builder b/actionpack/test/fixtures/test/_hello.builder
deleted file mode 100644
index ef52f632d1..0000000000
--- a/actionpack/test/fixtures/test/_hello.builder
+++ /dev/null
@@ -1 +0,0 @@
-xm.hello
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_json_change_priority.json.erb b/actionpack/test/fixtures/test/_json_change_priority.json.erb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/actionpack/test/fixtures/test/_labelling_form.erb b/actionpack/test/fixtures/test/_labelling_form.erb
deleted file mode 100644
index 1b95763165..0000000000
--- a/actionpack/test/fixtures/test/_labelling_form.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= labelling_form.label :title %>
diff --git a/actionpack/test/fixtures/test/_layout_for_partial.html.erb b/actionpack/test/fixtures/test/_layout_for_partial.html.erb
deleted file mode 100644
index 666efadbb6..0000000000
--- a/actionpack/test/fixtures/test/_layout_for_partial.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Before (<%= name %>)
-<%= yield %>
-After
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_partial_for_use_in_layout.html.erb b/actionpack/test/fixtures/test/_partial_for_use_in_layout.html.erb
deleted file mode 100644
index 3a03a64e31..0000000000
--- a/actionpack/test/fixtures/test/_partial_for_use_in_layout.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-Inside from partial (<%= name %>)
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_partial_html_erb.html.erb b/actionpack/test/fixtures/test/_partial_html_erb.html.erb
deleted file mode 100644
index 4b54875782..0000000000
--- a/actionpack/test/fixtures/test/_partial_html_erb.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= "partial.html.erb" %>
diff --git a/actionpack/test/fixtures/test/_partial_name_local_variable.erb b/actionpack/test/fixtures/test/_partial_name_local_variable.erb
deleted file mode 100644
index cc3a91c89f..0000000000
--- a/actionpack/test/fixtures/test/_partial_name_local_variable.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= partial_name_local_variable %>
diff --git a/actionpack/test/fixtures/test/_partial_only.erb b/actionpack/test/fixtures/test/_partial_only.erb
deleted file mode 100644
index a44b3eed40..0000000000
--- a/actionpack/test/fixtures/test/_partial_only.erb
+++ /dev/null
@@ -1 +0,0 @@
-only partial
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_partial_only_html.html b/actionpack/test/fixtures/test/_partial_only_html.html
deleted file mode 100644
index d2d630bd40..0000000000
--- a/actionpack/test/fixtures/test/_partial_only_html.html
+++ /dev/null
@@ -1 +0,0 @@
-only html partial
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_partial_with_partial.erb b/actionpack/test/fixtures/test/_partial_with_partial.erb
deleted file mode 100644
index ee0d5037b6..0000000000
--- a/actionpack/test/fixtures/test/_partial_with_partial.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= render 'test/partial' %>
-partial with partial
diff --git a/actionpack/test/fixtures/test/_person.erb b/actionpack/test/fixtures/test/_person.erb
deleted file mode 100644
index b2e5688956..0000000000
--- a/actionpack/test/fixtures/test/_person.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-Second: <%= name %>
-Third: <%= @name %>
diff --git a/actionpack/test/fixtures/test/_raise_indentation.html.erb b/actionpack/test/fixtures/test/_raise_indentation.html.erb
deleted file mode 100644
index f9a93728fe..0000000000
--- a/actionpack/test/fixtures/test/_raise_indentation.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<p>First paragraph</p>
-<p>Second paragraph</p>
-<p>Third paragraph</p>
-<p>Fourth paragraph</p>
-<p>Fifth paragraph</p>
-<p>Sixth paragraph</p>
-<p>Seventh paragraph</p>
-<p>Eight paragraph</p>
-<p>Ninth paragraph</p>
-<p>Tenth paragraph</p>
-<%= raise "error here!" %>
-<p>Eleventh paragraph</p>
-<p>Twelfth paragraph</p>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_second_json_partial.json.erb b/actionpack/test/fixtures/test/_second_json_partial.json.erb
deleted file mode 100644
index 5ebb7f1afd..0000000000
--- a/actionpack/test/fixtures/test/_second_json_partial.json.erb
+++ /dev/null
@@ -1 +0,0 @@
-Third level
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/action_talk_to_layout.erb b/actionpack/test/fixtures/test/action_talk_to_layout.erb
deleted file mode 100644
index 36e896daa8..0000000000
--- a/actionpack/test/fixtures/test/action_talk_to_layout.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<% @title = "Talking to the layout" -%>
-Action was here!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/calling_partial_with_layout.html.erb b/actionpack/test/fixtures/test/calling_partial_with_layout.html.erb
deleted file mode 100644
index ac44bc0d81..0000000000
--- a/actionpack/test/fixtures/test/calling_partial_with_layout.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render(:layout => "layout_for_partial", :partial => "partial_for_use_in_layout", :locals => { :name => "David" }) %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/capturing.erb b/actionpack/test/fixtures/test/capturing.erb
deleted file mode 100644
index 1addaa40d9..0000000000
--- a/actionpack/test/fixtures/test/capturing.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% days = capture do %>
-  Dreamy days
-<% end %>
-<%= days %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/change_priority.html.erb b/actionpack/test/fixtures/test/change_priority.html.erb
deleted file mode 100644
index 5618977d05..0000000000
--- a/actionpack/test/fixtures/test/change_priority.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= render :partial => "test/json_change_priority", formats: :json %>
-HTML Template, but <%= render :partial => "test/changing_priority" %> partial
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/content_for.erb b/actionpack/test/fixtures/test/content_for.erb
deleted file mode 100644
index 1fb829f54c..0000000000
--- a/actionpack/test/fixtures/test/content_for.erb
+++ /dev/null
@@ -1 +0,0 @@
-<% content_for :title do -%>Putting stuff in the title!<% end -%>Great stuff!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/content_for_concatenated.erb b/actionpack/test/fixtures/test/content_for_concatenated.erb
deleted file mode 100644
index e65f629574..0000000000
--- a/actionpack/test/fixtures/test/content_for_concatenated.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% content_for :title, "Putting stuff "
-   content_for :title, "in the title!" -%>
-Great stuff!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/content_for_with_parameter.erb b/actionpack/test/fixtures/test/content_for_with_parameter.erb
deleted file mode 100644
index aeb6f73ce0..0000000000
--- a/actionpack/test/fixtures/test/content_for_with_parameter.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<% content_for :title, "Putting stuff in the title!" -%>
-Great stuff!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/formatted_html_erb.html.erb b/actionpack/test/fixtures/test/formatted_html_erb.html.erb
deleted file mode 100644
index 1c64efabd8..0000000000
--- a/actionpack/test/fixtures/test/formatted_html_erb.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-formatted html erb
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/greeting.html.erb b/actionpack/test/fixtures/test/greeting.html.erb
deleted file mode 100644
index 62fb0293f0..0000000000
--- a/actionpack/test/fixtures/test/greeting.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<p>This is grand!</p>
diff --git a/actionpack/test/fixtures/test/greeting.xml.erb b/actionpack/test/fixtures/test/greeting.xml.erb
deleted file mode 100644
index 62fb0293f0..0000000000
--- a/actionpack/test/fixtures/test/greeting.xml.erb
+++ /dev/null
@@ -1 +0,0 @@
-<p>This is grand!</p>
diff --git a/actionpack/test/fixtures/test/hello,world.erb b/actionpack/test/fixtures/test/hello,world.erb
deleted file mode 100644
index bc8fa5e0ca..0000000000
--- a/actionpack/test/fixtures/test/hello,world.erb
+++ /dev/null
@@ -1 +0,0 @@
-Hello w*rld!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello.builder b/actionpack/test/fixtures/test/hello.builder
deleted file mode 100644
index a471553941..0000000000
--- a/actionpack/test/fixtures/test/hello.builder
+++ /dev/null
@@ -1,4 +0,0 @@
-xml.html do
-  xml.p "Hello #{@name}"
-  xml << render(:file => "test/greeting")
-end
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world_container.builder b/actionpack/test/fixtures/test/hello_world_container.builder
deleted file mode 100644
index e48d75c405..0000000000
--- a/actionpack/test/fixtures/test/hello_world_container.builder
+++ /dev/null
@@ -1,3 +0,0 @@
-xml.test do
-  render :partial => 'hello', :locals => { :xm => xml }
-end
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world_from_rxml.builder b/actionpack/test/fixtures/test/hello_world_from_rxml.builder
deleted file mode 100644
index 619a97ba96..0000000000
--- a/actionpack/test/fixtures/test/hello_world_from_rxml.builder
+++ /dev/null
@@ -1,3 +0,0 @@
-xml.html do
-  xml.p "Hello"
-end
diff --git a/actionpack/test/fixtures/test/hello_world_with_layout_false.erb b/actionpack/test/fixtures/test/hello_world_with_layout_false.erb
deleted file mode 100644
index 6769dd60bd..0000000000
--- a/actionpack/test/fixtures/test/hello_world_with_layout_false.erb
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/html_template.html.erb b/actionpack/test/fixtures/test/html_template.html.erb
deleted file mode 100644
index 1bbc2b7f09..0000000000
--- a/actionpack/test/fixtures/test/html_template.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => "test/first_json_partial", formats: :json %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hyphen-ated.erb b/actionpack/test/fixtures/test/hyphen-ated.erb
deleted file mode 100644
index cd0875583a..0000000000
--- a/actionpack/test/fixtures/test/hyphen-ated.erb
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
diff --git a/actionpack/test/fixtures/test/list.erb b/actionpack/test/fixtures/test/list.erb
deleted file mode 100644
index 0a4bda58ee..0000000000
--- a/actionpack/test/fixtures/test/list.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= @test_unchanged = 'goodbye' %><%= render :partial => 'customer', :collection => @customers %><%= @test_unchanged %>
diff --git a/actionpack/test/fixtures/test/non_erb_block_content_for.builder b/actionpack/test/fixtures/test/non_erb_block_content_for.builder
deleted file mode 100644
index d539a425a4..0000000000
--- a/actionpack/test/fixtures/test/non_erb_block_content_for.builder
+++ /dev/null
@@ -1,4 +0,0 @@
-content_for :title do
-  'Putting stuff in the title!'
-end
-xml << "Great stuff!"
diff --git a/actionpack/test/fixtures/test/potential_conflicts.erb b/actionpack/test/fixtures/test/potential_conflicts.erb
deleted file mode 100644
index a5e964e359..0000000000
--- a/actionpack/test/fixtures/test/potential_conflicts.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-First: <%= @name %>
-<%= render :partial => "person", :locals => { :name => "Stephan" } -%>
-Fourth: <%= @name %>
-Fifth: <%= name %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/proper_block_detection.erb b/actionpack/test/fixtures/test/proper_block_detection.erb
deleted file mode 100644
index b55efbb25d..0000000000
--- a/actionpack/test/fixtures/test/proper_block_detection.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= @todo %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/render_file_from_template.html.erb b/actionpack/test/fixtures/test/render_file_from_template.html.erb
deleted file mode 100644
index fde9f4bb64..0000000000
--- a/actionpack/test/fixtures/test/render_file_from_template.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :file => @path %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/render_file_with_locals_and_default.erb b/actionpack/test/fixtures/test/render_file_with_locals_and_default.erb
deleted file mode 100644
index 9b4900acc5..0000000000
--- a/actionpack/test/fixtures/test/render_file_with_locals_and_default.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= secret ||= 'one' %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb b/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb
deleted file mode 100644
index 0740b2d07c..0000000000
--- a/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-Hey HTML!
diff --git a/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb b/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb
deleted file mode 100644
index 4a11845cfe..0000000000
--- a/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-Hello HTML!
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb b/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb
deleted file mode 100644
index 892ae5eca2..0000000000
--- a/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-alert('hello');
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/render_partial_inside_directory.html.erb b/actionpack/test/fixtures/test/render_partial_inside_directory.html.erb
deleted file mode 100644
index 1461b95186..0000000000
--- a/actionpack/test/fixtures/test/render_partial_inside_directory.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render partial: 'test/_directory/partial_with_locales', locals: {'name' => 'Jane'} %>
diff --git a/actionpack/test/fixtures/test/render_to_string_test.erb b/actionpack/test/fixtures/test/render_to_string_test.erb
deleted file mode 100644
index 6e267e8634..0000000000
--- a/actionpack/test/fixtures/test/render_to_string_test.erb
+++ /dev/null
@@ -1 +0,0 @@
-The value of foo is: ::<%= @foo %>::
diff --git a/actionpack/test/fixtures/test/render_two_partials.html.erb b/actionpack/test/fixtures/test/render_two_partials.html.erb
deleted file mode 100644
index 3db6025860..0000000000
--- a/actionpack/test/fixtures/test/render_two_partials.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= render :partial => 'partial', :locals => {'first' => '1'} %>
-<%= render :partial => 'partial', :locals => {'second' => '2'} %>
diff --git a/actionpack/test/fixtures/test/using_layout_around_block.html.erb b/actionpack/test/fixtures/test/using_layout_around_block.html.erb
deleted file mode 100644
index 3d6661df9a..0000000000
--- a/actionpack/test/fixtures/test/using_layout_around_block.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render(:layout => "layout_for_partial", :locals => { :name => "David" }) do %>Inside from block<% end %>
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/with_html_partial.html.erb b/actionpack/test/fixtures/test/with_html_partial.html.erb
deleted file mode 100644
index d84d909d64..0000000000
--- a/actionpack/test/fixtures/test/with_html_partial.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<strong><%= render :partial => "partial_only_html" %></strong>
diff --git a/actionpack/test/fixtures/test/with_partial.html.erb b/actionpack/test/fixtures/test/with_partial.html.erb
deleted file mode 100644
index 7502364cf5..0000000000
--- a/actionpack/test/fixtures/test/with_partial.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<strong><%= render :partial => "partial_only" %></strong>
diff --git a/actionpack/test/fixtures/test/with_partial.text.erb b/actionpack/test/fixtures/test/with_partial.text.erb
deleted file mode 100644
index 5f068ebf27..0000000000
--- a/actionpack/test/fixtures/test/with_partial.text.erb
+++ /dev/null
@@ -1 +0,0 @@
-**<%= render :partial => "partial_only" %>**
diff --git a/actionpack/test/fixtures/test/with_xml_template.html.erb b/actionpack/test/fixtures/test/with_xml_template.html.erb
deleted file mode 100644
index e54a7cd001..0000000000
--- a/actionpack/test/fixtures/test/with_xml_template.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :template => "test/greeting", :formats => :xml %>
-- 
cgit v1.2.3


From 90f0cdc906fcec77937363c87cba45f3802ac858 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Jul 2014 11:35:27 -0700
Subject: always transcode the file to utf-8

people may be passing filenames to the constructor that are not utf-8,
but they will assome that calling `original_filename` returns utf-8
(because that's what it used to do).
---
 actionpack/test/dispatch/uploaded_file_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb
index 9f6381f118..55ebbd5143 100644
--- a/actionpack/test/dispatch/uploaded_file_test.rb
+++ b/actionpack/test/dispatch/uploaded_file_test.rb
@@ -18,6 +18,12 @@ module ActionDispatch
       assert_equal "UTF-8", uf.original_filename.encoding.to_s
     end
 
+    def test_filename_should_always_be_in_utf_8
+      uf = Http::UploadedFile.new(:filename => 'foo'.encode(Encoding::SHIFT_JIS),
+                                  :tempfile => Object.new)
+      assert_equal "UTF-8", uf.original_filename.encoding.to_s
+    end
+
     def test_content_type
       uf = Http::UploadedFile.new(:type => 'foo', :tempfile => Object.new)
       assert_equal 'foo', uf.content_type
-- 
cgit v1.2.3


From 4a7b95985f54ef1847f50eff294f7361d900539f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Jul 2014 15:41:47 -0700
Subject: Rails-ish apps should descend from Rails::Railtie

Use an is_a check to ensure it's a Railsish app so we can avoid
respond_to calls everywhere.
---
 actionpack/test/controller/integration_test.rb     |  3 ++-
 actionpack/test/dispatch/mount_test.rb             | 14 ++++++++++----
 actionpack/test/dispatch/prefix_generation_test.rb |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 214eab2f0d..78cce3aa64 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -1,6 +1,7 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'action_view/vendor/html-scanner'
+require 'rails/engine'
 
 class SessionTest < ActiveSupport::TestCase
   StubApp = lambda { |env|
@@ -595,7 +596,7 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
     @routes ||= ActionDispatch::Routing::RouteSet.new
   end
 
-  class MountedApp
+  class MountedApp < Rails::Engine
     def self.routes
       @routes ||= ActionDispatch::Routing::RouteSet.new
     end
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
index ff4b644c16..d5a4d8ee11 100644
--- a/actionpack/test/dispatch/mount_test.rb
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -1,12 +1,18 @@
 require 'abstract_unit'
+require 'rails/engine'
 
 class TestRoutingMount < ActionDispatch::IntegrationTest
   Router = ActionDispatch::Routing::RouteSet.new
 
-  class FakeEngine
+  class AppWithRoutes < Rails::Engine
     def self.routes
       @routes ||= ActionDispatch::Routing::RouteSet.new
     end
+  end
+
+  # Test for mounting apps that respond to routes, but aren't Rails-like apps.
+  class SinatraLikeApp
+    def self.routes; Object.new; end
 
     def self.call(env)
       [200, {"Content-Type" => "text/html"}, ["OK"]]
@@ -21,15 +27,15 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
     mount SprocketsApp, :at => "/sprockets"
     mount SprocketsApp => "/shorthand"
 
-    mount FakeEngine, :at => "/fakeengine", :as => :fake
-    mount FakeEngine, :at => "/getfake", :via => :get
+    mount SinatraLikeApp, :at => "/fakeengine", :as => :fake
+    mount SinatraLikeApp, :at => "/getfake", :via => :get
 
     scope "/its_a" do
       mount SprocketsApp, :at => "/sprocket"
     end
 
     resources :users do
-      mount FakeEngine, :at => "/fakeengine", :as => :fake_mounted_at_resource
+      mount AppWithRoutes, :at => "/fakeengine", :as => :fake_mounted_at_resource
     end
 
     mount SprocketsApp, :at => "/", :via => :get
diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index cd31e8e326..c6e4eefa7a 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'rack/test'
+require 'rails/engine'
 
 module TestGenerationPrefix
   class Post
@@ -23,7 +24,7 @@ module TestGenerationPrefix
   class WithMountedEngine < ActionDispatch::IntegrationTest
     include Rack::Test::Methods
 
-    class BlogEngine
+    class BlogEngine < Rails::Engine
       def self.routes
         @routes ||= begin
           routes = ActionDispatch::Routing::RouteSet.new
-- 
cgit v1.2.3


From a9765c54ea17153a69932730e1f5291c1f0055b0 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Jul 2014 10:04:52 -0700
Subject: helper methods are public, so we can just call them

also if you want a path from a named helper, you should call
helper_path, not helper_url(:only_path => true).
---
 actionpack/test/controller/url_for_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 7210c68e73..9f086af664 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -287,12 +287,12 @@ module AbstractController
           # We need to create a new class in order to install the new named route.
           kls = Class.new { include set.url_helpers }
           controller = kls.new
-          assert controller.respond_to?(:home_url)
+          assert_respond_to controller, :home_url
           assert_equal '/brave/new/world',
-            controller.send(:url_for, :controller => 'brave', :action => 'new', :id => 'world', :only_path => true)
+            controller.url_for(:controller => 'brave', :action => 'new', :id => 'world', :only_path => true)
 
-          assert_equal("/home/sweet/home/alabama", controller.send(:home_url, :user => 'alabama', :host => 'unused', :only_path => true))
-          assert_equal("/home/sweet/home/alabama", controller.send(:home_path, 'alabama'))
+          assert_equal("/home/sweet/home/alabama", controller.home_path(:user => 'alabama', :host => 'unused', :only_path => true))
+          assert_equal("/home/sweet/home/alabama", controller.home_path('alabama'))
         end
       end
 
-- 
cgit v1.2.3


From 212057b912627b9c4056f911a43c83b18ae3ab34 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Jul 2014 11:21:06 -0700
Subject: pass the route name to define_url_helper

this allows us to avoid 2 hash allocations per named helper definition,
also we can avoid a `merge` and `delete`.
---
 actionpack/test/abstract_unit.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 47d968982c..1c143a0f8c 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -350,7 +350,8 @@ end
 
 module RoutingTestHelpers
   def url_for(set, options)
-    set.url_for options.merge(:only_path => true)
+    route_name = options.delete :use_route
+    set.url_for options.merge(:only_path => true), route_name
   end
 
   def make_set(strict = true)
-- 
cgit v1.2.3


From c64bff2c87ebf363703c63ecd4a96d56a1a78364 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Jul 2014 12:08:41 -0700
Subject: [EXPERIMENTAL] run actionpack tests in parallel

only on forking systems though.  Feel free to revert this if it causes
problems.
---
 actionpack/test/abstract_unit.rb | 57 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 1c143a0f8c..472ac60a13 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -15,6 +15,10 @@ silence_warnings do
   Encoding.default_external = "UTF-8"
 end
 
+require 'drb'
+require 'drb/unix'
+require 'tempfile'
+
 require 'active_support/testing/autorun'
 require 'abstract_controller'
 require 'action_controller'
@@ -105,6 +109,7 @@ end
 module ActiveSupport
   class TestCase
     include ActionDispatch::DrawOnce
+    parallelize_me!
   end
 end
 
@@ -432,3 +437,55 @@ end
 def jruby_skip(message = '')
   skip message if defined?(JRUBY_VERSION)
 end
+
+class ForkingExecutor
+  class Server
+    include DRb::DRbUndumped
+
+    def initialize
+      @queue = Queue.new
+    end
+
+    def record reporter, result
+      reporter.synchronize { reporter.record result }
+    end
+
+    def << o; @queue << o; end
+    def pop; @queue.pop; end
+  end
+
+  def initialize size
+    @size  = size
+    @queue = Server.new
+    file   = File.join Dir.tmpdir, Dir::Tmpname.make_tmpname('tests', 'fd')
+    @url   = "drbunix://#{file}"
+    @pool  = nil
+    DRb.start_service @url, @queue
+  end
+
+  def << work; @queue << work; end
+
+  def shutdown
+    pool = @size.times.map {
+      fork {
+        DRb.stop_service
+        DRb.start_service
+        queue = DRbObject.new_with_uri @url
+        while job = queue.pop
+          klass    = job[0]
+          method   = job[1]
+          reporter = job[2]
+          result = Minitest.run_one_method klass, method
+          queue.record reporter, result
+        end
+      }
+    }
+    @size.times { @queue << nil }
+    pool.each { |pid| Process.waitpid pid }
+  end
+end
+
+if ActiveSupport::Testing::Isolation.forking_env?
+  # Use N processes (N defaults to 4)
+  Minitest.parallel_executor = ForkingExecutor.new((ENV['N'] || 4).to_i)
+end
-- 
cgit v1.2.3


From d548a36c8f9ebebe16446022c1efea471aa3296b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Jul 2014 13:10:08 -0700
Subject: only parallelize on forking systems

---
 actionpack/test/abstract_unit.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 472ac60a13..afc14b9be9 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -109,7 +109,7 @@ end
 module ActiveSupport
   class TestCase
     include ActionDispatch::DrawOnce
-    parallelize_me!
+    parallelize_me! if ActiveSupport::Testing::Isolation.forking_env?
   end
 end
 
-- 
cgit v1.2.3


From 8d126c9424208a52b01ad5237a48b214063e2a99 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Jul 2014 14:04:25 -0700
Subject: do not restart the service, just stop it

---
 actionpack/test/abstract_unit.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index afc14b9be9..1254859a5c 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -469,7 +469,6 @@ class ForkingExecutor
     pool = @size.times.map {
       fork {
         DRb.stop_service
-        DRb.start_service
         queue = DRbObject.new_with_uri @url
         while job = queue.pop
           klass    = job[0]
-- 
cgit v1.2.3


From abd74308957b383777c6a391017d39097309fe07 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Jul 2014 14:04:43 -0700
Subject: fix filesystem race condition

---
 actionpack/test/controller/log_subscriber_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index 18037b3d2f..49be7caf38 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -85,7 +85,7 @@ class ACLogSubscriberTest < ActionController::TestCase
 
     @old_logger = ActionController::Base.logger
 
-    @cache_path = File.expand_path('../temp/test_cache', File.dirname(__FILE__))
+    @cache_path = File.join Dir.tmpdir, Dir::Tmpname.make_tmpname('tmp', 'cache')
     @controller.cache_store = :file_store, @cache_path
     ActionController::LogSubscriber.attach_to :action_controller
   end
-- 
cgit v1.2.3


From 5751b7ea58d7cf259dda30fb42fff51fc6ae93d5 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Jul 2014 14:43:58 -0700
Subject: pass the test reporter by reference

this prevents the array from being dumped as a DRbObject so we can
reduce communication with the server.  the reporter should always exist
on the server side, so we don't have to worry about GC
---
 actionpack/test/abstract_unit.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 1254859a5c..9a1f05500b 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -450,7 +450,10 @@ class ForkingExecutor
       reporter.synchronize { reporter.record result }
     end
 
-    def << o; @queue << o; end
+    def << o
+      o[2] = DRbObject.new(o[2]) if o
+      @queue << o
+    end
     def pop; @queue.pop; end
   end
 
-- 
cgit v1.2.3


From d4c8068675f0b6be025590471b40ff175daa845e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Jul 2014 18:43:46 -0700
Subject: reporting is only done in one thread, so we can safely remove the
 lock

(I think)
---
 actionpack/test/abstract_unit.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 9a1f05500b..0f7b3a08e1 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -447,7 +447,7 @@ class ForkingExecutor
     end
 
     def record reporter, result
-      reporter.synchronize { reporter.record result }
+      reporter.record result
     end
 
     def << o
-- 
cgit v1.2.3


From 6c5f1692eea160f6f967d71eaca478ccfef19df8 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 8 Jul 2014 23:27:59 +0800
Subject: Update outdated test.

The current test is asserting against an outdated version of
Request#method where HEAD requests are treated as GET requests.
---
 actionpack/test/dispatch/request_test.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 9cbd53002b..5d4bd7a224 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -647,12 +647,9 @@ class RequestMethod < BaseRequestTest
     end
   end
 
-  test "allow method hacking on post" do
-    %w(GET OPTIONS PATCH PUT POST DELETE).each do |method|
-      request = stub_request 'REQUEST_METHOD' => method.to_s.upcase
-
-      assert_equal(method == "HEAD" ? "GET" : method, request.method)
-    end
+  test "method returns original value of environment request method on POST" do
+    request = stub_request('rack.methodoverride.original_method' => 'POST')
+    assert_equal 'POST', request.method
   end
 
   test "invalid method hacking on post raises exception" do
-- 
cgit v1.2.3


From 5e11e414208608b7e43372154493b3e0a184e580 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 8 Jul 2014 23:39:08 +0800
Subject: Update test to clearly reflect what it is testing for.

---
 actionpack/test/dispatch/request_test.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 5d4bd7a224..62fc86f6a0 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -632,12 +632,14 @@ class RequestProtocol < BaseRequestTest
 end
 
 class RequestMethod < BaseRequestTest
-  test "request methods" do
-    [:post, :get, :patch, :put, :delete].each do |method|
-      request = stub_request('REQUEST_METHOD' => method.to_s.upcase)
+  test "method returns environment's request method when it has not been
+    overriden by middleware".squish do
 
-      assert_equal method.to_s.upcase, request.method
-      assert_equal method, request.method_symbol
+    ActionDispatch::Request::HTTP_METHODS.each do |method|
+      request = stub_request('REQUEST_METHOD' => method)
+
+      assert_equal method, request.method
+      assert_equal method.underscore.to_sym, request.method_symbol
     end
   end
 
-- 
cgit v1.2.3


From 095a54502e58eac2b796500fc73c5c2afba91b04 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 8 Jul 2014 23:42:40 +0800
Subject: Fix duplicated test.

There is already another test covering Request#request_method. This
test should cover Request#method.
---
 actionpack/test/dispatch/request_test.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 62fc86f6a0..db52bca441 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -654,9 +654,13 @@ class RequestMethod < BaseRequestTest
     assert_equal 'POST', request.method
   end
 
-  test "invalid method hacking on post raises exception" do
+  test "method raises exception on invalid HTTP method" do
     assert_raise(ActionController::UnknownHttpMethod) do
-      stub_request('REQUEST_METHOD' => '_RANDOM_METHOD').request_method
+      stub_request('rack.methodoverride.original_method' => '_RANDOM_METHOD').method
+    end
+
+    assert_raise(ActionController::UnknownHttpMethod) do
+      stub_request('REQUEST_METHOD' => '_RANDOM_METHOD').method
     end
   end
 
-- 
cgit v1.2.3


From 533472dfe9d9252a2df3a4ce76d867d8df54d375 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 9 Jul 2014 08:50:51 +0800
Subject: Remove redundant test.

Since we're stubbing the request, the test is actually just asserting
that `@method = env['REQUEST_METHOD']`. In order to the test against
the methodoverride middleware, we should test it against an actual
request. However, Rack is already covering this scenario so we can
remove this test.
---
 actionpack/test/dispatch/request_test.rb | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index db52bca441..7b00998ac9 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -664,17 +664,6 @@ class RequestMethod < BaseRequestTest
     end
   end
 
-  test "restrict method hacking" do
-    [:get, :patch, :put, :delete].each do |method|
-      request = stub_request(
-        'action_dispatch.request.request_parameters' => { :_method => 'put' },
-        'REQUEST_METHOD' => method.to_s.upcase
-      )
-
-      assert_equal method.to_s.upcase, request.method
-    end
-  end
-
   test "post masquerading as patch" do
     request = stub_request(
       'REQUEST_METHOD' => 'PATCH',
-- 
cgit v1.2.3


From 9ff18e4626ceb3e50b81b2966d304d02160b619e Mon Sep 17 00:00:00 2001
From: Earl J St Sauver <estsauver@gmail.com>
Date: Sun, 27 Apr 2014 16:41:25 -0700
Subject: LOCALHOST definition should match any 127.0.0.0/8 address

The entire 127.0.0.0/8 range is assigned to the loopback address, not
only 127.0.0.0/24. This patch allows ActionDispatch::Request::LOCALHOST
to match any IPv4 127.0.0.0/8 loopback address.

The only place that the #local? method was previously under test was
in the show_expectations_test.rb file. I don't particularly like that
that's implicitly where this code is under test, and I feel like I
should move some of that testing code into the
test/dispatch/request_test.rb file, but I wanted some feedback first.

Credit goes to @sriedel for discovering the issue and adding the
patch.
---
 actionpack/test/controller/show_exceptions_test.rb | 2 +-
 actionpack/test/dispatch/request_test.rb           | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index ff23b22040..f7eba1ef43 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -32,7 +32,7 @@ module ShowExceptions
 
     test 'show diagnostics from a local ip if show_detailed_exceptions? is set to request.local?' do
       @app = ShowExceptionsController.action(:boom)
-      ['127.0.0.1', '127.0.0.127', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address|
+      ['127.0.0.1', '127.0.0.127', '127.12.1.1', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address|
         self.remote_addr = ip_address
         get '/'
         assert_match(/boom/, body)
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 1ef2b062dd..beae95f3fd 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -528,6 +528,13 @@ class RequestCGI < BaseRequestTest
   end
 end
 
+class LocalhostTest < BaseRequestTest
+  test "IPs that match localhost" do
+    request = stub_request("REMOTE_IP" => "127.1.1.1", "REMOTE_ADDR" => "127.1.1.1")
+    assert_equal !!request.local?, true 
+  end
+end
+
 class RequestCookie < BaseRequestTest
   test "cookie syntax resilience" do
     request = stub_request("HTTP_COOKIE" => "_session_id=c84ace84796670c052c6ceb2451fb0f2; is_admin=yes")
-- 
cgit v1.2.3


From 86433b8d5f1a7d28e0bb6ceeaf824e67acf4b759 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Fri, 18 Jul 2014 13:27:43 -0400
Subject: Add CHANGELOG for #14886

Also cleanup test a bit

[related #14886]
[related #14743]
---
 actionpack/test/dispatch/request_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index beae95f3fd..2763bd661f 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -531,7 +531,7 @@ end
 class LocalhostTest < BaseRequestTest
   test "IPs that match localhost" do
     request = stub_request("REMOTE_IP" => "127.1.1.1", "REMOTE_ADDR" => "127.1.1.1")
-    assert_equal !!request.local?, true 
+    assert request.local?
   end
 end
 
-- 
cgit v1.2.3


From fd6aaaa0c308b36df3bf06eb87b9eebfca1de127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sat, 19 Jul 2014 17:35:12 -0300
Subject: Stop requiring mocha automatically

We are planning to remove mocha from our test suite because of
performance problems. To make this possible we should stop require mocha
on ActionSupport::TestCase.

This should not affect applications since users still need to add mocha
to Gemfile and this already load mocha.

Added FIXME notes to place that still need mocha removal
---
 actionpack/test/abstract_unit.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 6584d20840..3fe94452b5 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -359,3 +359,5 @@ end
 def jruby_skip(message = '')
   skip message if defined?(JRUBY_VERSION)
 end
+
+require 'mocha/setup' # FIXME: stop using mocha
-- 
cgit v1.2.3


From d14f64699715d24a7ceb33e6ef8fa14127716c24 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Sun, 20 Jul 2014 22:51:39 +0800
Subject: Fix AC::TemplateAssertions instance variables not resetting.

Fixes https://github.com/rails/rails/issues/16119.
---
 .../test/dispatch/template_assertions_test.rb      | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 actionpack/test/dispatch/template_assertions_test.rb

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/template_assertions_test.rb b/actionpack/test/dispatch/template_assertions_test.rb
new file mode 100644
index 0000000000..b8bc8e22d4
--- /dev/null
+++ b/actionpack/test/dispatch/template_assertions_test.rb
@@ -0,0 +1,58 @@
+require 'abstract_unit'
+
+class AssertTemplateController < ActionController::Base
+  def render_with_partial
+    render partial: 'test/partial'
+  end
+
+  def render_with_template
+    render 'test/hello_world'
+  end
+
+  def render_with_layout
+    @variable_for_layout = nil
+    render 'test/hello_world', layout: "layouts/standard"
+  end
+
+  def render_with_file
+    render file: 'README.rdoc'
+  end
+
+  def render_nothing
+    head :ok
+  end
+end
+
+class AssertTemplateControllerTest < ActionDispatch::IntegrationTest
+  def test_assert_template_reset_between_requests
+    get '/assert_template/render_with_template'
+    assert_template 'test/hello_world'
+
+    get '/assert_template/render_nothing'
+    assert_template nil
+  end
+
+  def test_assert_partial_reset_between_requests
+    get '/assert_template/render_with_partial'
+    assert_template partial: 'test/_partial'
+
+    get '/assert_template/render_nothing'
+    assert_template partial: nil
+  end
+
+  def test_assert_layout_reset_between_requests
+    get '/assert_template/render_with_layout'
+    assert_template layout: 'layouts/standard'
+
+    get '/assert_template/render_nothing'
+    assert_template layout: nil
+  end
+
+  def test_assert_file_reset_between_requests
+    get '/assert_template/render_with_file'
+    assert_template file: 'README.rdoc'
+
+    get '/assert_template/render_nothing'
+    assert_template file: nil
+  end
+end
-- 
cgit v1.2.3


From 0b773c30fb5dd9822a5af21e395b1b994baca9d3 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 23 Jul 2014 10:38:41 -0700
Subject: specify N=0 to prevent parallel tests (just run tests on the main
 process)

---
 actionpack/test/abstract_unit.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index b07d8a7be0..987ef7de1f 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -19,6 +19,8 @@ require 'drb'
 require 'drb/unix'
 require 'tempfile'
 
+PROCESS_COUNT = (ENV['N'] || 4).to_i
+
 require 'active_support/testing/autorun'
 require 'abstract_controller'
 require 'action_controller'
@@ -109,7 +111,9 @@ end
 module ActiveSupport
   class TestCase
     include ActionDispatch::DrawOnce
-    parallelize_me! if ActiveSupport::Testing::Isolation.forking_env?
+    if ActiveSupport::Testing::Isolation.forking_env? && PROCESS_COUNT > 0
+      parallelize_me!
+    end
   end
 end
 
@@ -489,7 +493,7 @@ class ForkingExecutor
   end
 end
 
-if ActiveSupport::Testing::Isolation.forking_env?
+if ActiveSupport::Testing::Isolation.forking_env? && PROCESS_COUNT > 0
   # Use N processes (N defaults to 4)
   Minitest.parallel_executor = ForkingExecutor.new((ENV['N'] || 4).to_i)
 end
-- 
cgit v1.2.3


From decb83b9fd1106479c196771db657839d37d1481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 23 Jul 2014 14:40:43 -0300
Subject: Use PROCESS_COUNT to define the number of parallel executors

---
 actionpack/test/abstract_unit.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 987ef7de1f..4e17d57dad 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -495,5 +495,5 @@ end
 
 if ActiveSupport::Testing::Isolation.forking_env? && PROCESS_COUNT > 0
   # Use N processes (N defaults to 4)
-  Minitest.parallel_executor = ForkingExecutor.new((ENV['N'] || 4).to_i)
+  Minitest.parallel_executor = ForkingExecutor.new(PROCESS_COUNT)
 end
-- 
cgit v1.2.3


From cc10288e5fdded5d4410d16c4bf6c6da0b55a23b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 24 Jul 2014 10:59:29 +0800
Subject: Bug fix for assert_template when opening a new session.

See https://github.com/rails/rails/pull/16234#commitcomment-7115670.
---
 .../test/dispatch/template_assertions_test.rb      | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/template_assertions_test.rb b/actionpack/test/dispatch/template_assertions_test.rb
index b8bc8e22d4..2c6a1185e6 100644
--- a/actionpack/test/dispatch/template_assertions_test.rb
+++ b/actionpack/test/dispatch/template_assertions_test.rb
@@ -55,4 +55,44 @@ class AssertTemplateControllerTest < ActionDispatch::IntegrationTest
     get '/assert_template/render_nothing'
     assert_template file: nil
   end
+
+  def test_template_reset_between_requests_when_opening_a_session
+    open_session do |session|
+      session.get '/assert_template/render_with_template'
+      session.assert_template 'test/hello_world'
+
+      session.get '/assert_template/render_nothing'
+      session.assert_template nil
+    end
+  end
+
+  def test_partial_reset_between_requests_when_opening_a_session
+    open_session do |session|
+      session.get '/assert_template/render_with_partial'
+      session.assert_template partial: 'test/_partial'
+
+      session.get '/assert_template/render_nothing'
+      session.assert_template partial: nil
+    end
+  end
+
+  def test_layout_reset_between_requests_when_opening_a_session
+    open_session do |session|
+      session.get '/assert_template/render_with_layout'
+      session.assert_template layout: 'layouts/standard'
+
+      session.get '/assert_template/render_nothing'
+      session.assert_template layout: nil
+    end
+  end
+
+  def test_file_reset_between_requests_when_opening_a_session
+    open_session do |session|
+      session.get '/assert_template/render_with_file'
+      session.assert_template file: 'README.rdoc'
+
+      session.get '/assert_template/render_nothing'
+      session.assert_template file: nil
+    end
+  end
 end
-- 
cgit v1.2.3


From e6f2d4f68577643b15883b94ead417f75967d2d6 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 25 Jul 2014 00:43:45 +0800
Subject: Improve description of tests.

---
 actionpack/test/dispatch/template_assertions_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/template_assertions_test.rb b/actionpack/test/dispatch/template_assertions_test.rb
index 2c6a1185e6..3c393f937b 100644
--- a/actionpack/test/dispatch/template_assertions_test.rb
+++ b/actionpack/test/dispatch/template_assertions_test.rb
@@ -24,7 +24,7 @@ class AssertTemplateController < ActionController::Base
 end
 
 class AssertTemplateControllerTest < ActionDispatch::IntegrationTest
-  def test_assert_template_reset_between_requests
+  def test_template_reset_between_requests
     get '/assert_template/render_with_template'
     assert_template 'test/hello_world'
 
@@ -32,7 +32,7 @@ class AssertTemplateControllerTest < ActionDispatch::IntegrationTest
     assert_template nil
   end
 
-  def test_assert_partial_reset_between_requests
+  def test_partial_reset_between_requests
     get '/assert_template/render_with_partial'
     assert_template partial: 'test/_partial'
 
@@ -40,7 +40,7 @@ class AssertTemplateControllerTest < ActionDispatch::IntegrationTest
     assert_template partial: nil
   end
 
-  def test_assert_layout_reset_between_requests
+  def test_layout_reset_between_requests
     get '/assert_template/render_with_layout'
     assert_template layout: 'layouts/standard'
 
@@ -48,7 +48,7 @@ class AssertTemplateControllerTest < ActionDispatch::IntegrationTest
     assert_template layout: nil
   end
 
-  def test_assert_file_reset_between_requests
+  def test_file_reset_between_requests
     get '/assert_template/render_with_file'
     assert_template file: 'README.rdoc'
 
-- 
cgit v1.2.3


From f6a52f1e9d28d2cf78ed03ab029e2c6692e4045f Mon Sep 17 00:00:00 2001
From: Rajarshi Das <mita9051@gmail.com>
Date: Sat, 26 Jul 2014 10:23:35 +0530
Subject: add comment to the empty each method for not removing it in future

---
 actionpack/test/dispatch/debug_exceptions_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index 8660deb634..4620d0494a 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -9,7 +9,8 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
       @detailed = detailed
       @closed = false
     end
-
+    
+    #This method should not remove as the body must respond to this
     def each
     end
 
-- 
cgit v1.2.3


From 2bbcca004cc232cef868cd0e301f274ce5638df0 Mon Sep 17 00:00:00 2001
From: "@schneems and @sgrif" <sean@thoughtbot.com>
Date: Thu, 19 Jun 2014 17:26:29 -0500
Subject: Deprecate `*_path` methods in mailers

Email does not support relative links since there is no implicit host. Therefore all links inside of emails must be fully qualified URLs. All path helpers are now deprecated. When removed, the error will give early indication to developers to use `*_url` methods instead.

Currently if a developer uses a `*_path` helper, their tests and `mail_view` will not catch the mistake. The only way to see the error is by sending emails in production. Preventing sending out emails with non-working path's is the desired end goal of this PR.

Currently path helpers are mixed-in to controllers (the ActionMailer::Base acts as a controller). All `*_url` and `*_path` helpers are made available through the same module. This PR separates this behavior into two modules so we can extend the `*_path` methods to add a Deprecation to them. Once deprecated we can use this same area to raise a NoMethodError and add an informative message directing the developer to use `*_url` instead.

The module with warnings is only mixed in when a controller returns false from the newly added `supports_relative_path?`.

Paired @sgrif & @schneems
---
 actionpack/test/routing/helper_test.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/routing/helper_test.rb b/actionpack/test/routing/helper_test.rb
index 0028aaa629..09ca7ff73b 100644
--- a/actionpack/test/routing/helper_test.rb
+++ b/actionpack/test/routing/helper_test.rb
@@ -26,6 +26,20 @@ module ActionDispatch
           x.new.pond_duck_path Duck.new
         end
       end
+
+      def test_path_deprecation
+        rs = ::ActionDispatch::Routing::RouteSet.new
+        rs.draw do
+          resources :ducks
+        end
+
+        x = Class.new {
+          include rs.url_helpers(false)
+        }
+        assert_deprecated do
+          assert_equal '/ducks', x.new.ducks_path
+        end
+      end
     end
   end
 end
-- 
cgit v1.2.3


From d97ba0d31bd10cd793649dbeb9e972edf3934fa7 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Wed, 30 Jul 2014 23:48:22 -0300
Subject: Remove unnecessary call to #tap

This is not storying the RouteSet instance anywhere as the other
examples in the file, so no need to use #tap.
---
 actionpack/test/dispatch/routing_test.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 269c7b4159..b8e20c52a0 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -4292,11 +4292,9 @@ end
 class TestCallableConstraintValidation < ActionDispatch::IntegrationTest
   def test_constraint_with_object_not_callable
     assert_raises(ArgumentError) do
-      ActionDispatch::Routing::RouteSet.new.tap do |app|
-        app.draw do
-          ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
-          get '/test', to: ok, constraints: Object.new
-        end
+      ActionDispatch::Routing::RouteSet.new.draw do
+        ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+        get '/test', to: ok, constraints: Object.new
       end
     end
   end
-- 
cgit v1.2.3


From 930110b0452bd33e0ee54e9ec6d68e904ba7a0ad Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 9 Jul 2014 21:49:37 -0300
Subject: Regenerate sid when sbdy tries to fixate the session

Fixed broken test.

Thanks Stephen Richards for reporting.
---
 actionpack/test/dispatch/session/cache_store_test.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/session/cache_store_test.rb b/actionpack/test/dispatch/session/cache_store_test.rb
index b8479e8836..9f810cad01 100644
--- a/actionpack/test/dispatch/session/cache_store_test.rb
+++ b/actionpack/test/dispatch/session/cache_store_test.rb
@@ -148,16 +148,15 @@ class CacheStoreTest < ActionDispatch::IntegrationTest
 
   def test_prevents_session_fixation
     with_test_route_set do
-      get '/get_session_value'
-      assert_response :success
-      assert_equal 'foo: nil', response.body
-      session_id = cookies['_session_id']
+      assert_equal nil, @cache.read('_session_id:0xhax')
 
-      reset!
+      cookies['_session_id'] = '0xhax'
+      get '/set_session_value'
 
-      get '/set_session_value', :_session_id => session_id
       assert_response :success
-      assert_not_equal session_id, cookies['_session_id']
+      assert_not_equal '0xhax', cookies['_session_id']
+      assert_equal nil, @cache.read('_session_id:0xhax')
+      assert_equal({'foo' => 'bar'}, @cache.read("_session_id:#{cookies['_session_id']}"))
     end
   end
 
@@ -169,8 +168,8 @@ class CacheStoreTest < ActionDispatch::IntegrationTest
         end
 
         @app = self.class.build_app(set) do |middleware|
-          cache = ActiveSupport::Cache::MemoryStore.new
-          middleware.use ActionDispatch::Session::CacheStore, :key => '_session_id', :cache => cache
+          @cache = ActiveSupport::Cache::MemoryStore.new
+          middleware.use ActionDispatch::Session::CacheStore, :key => '_session_id', :cache => @cache
           middleware.delete "ActionDispatch::ShowExceptions"
         end
 
-- 
cgit v1.2.3


From ed180eea48fdbfd26540145494fbbdfb1fa2d50b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 5 Aug 2014 09:45:21 -0700
Subject: just assign the instance variables on the test

---
 actionpack/test/dispatch/prefix_generation_test.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index c6e4eefa7a..7cf3559e5d 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -165,16 +165,12 @@ module TestGenerationPrefix
       RailsApplication
     end
 
-    def engine_object
-      @engine_object ||= EngineObject.new
-    end
-
-    def app_object
-      @app_object ||= AppObject.new
-    end
+    attr_reader :engine_object, :app_object
 
     def setup
       RailsApplication.routes.default_url_options = {}
+      @engine_object = EngineObject.new
+      @app_object = AppObject.new
     end
 
     include BlogEngine.routes.mounted_helpers
-- 
cgit v1.2.3


From 70673759a036746987eda58e8b77cf723938d82c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 5 Aug 2014 16:28:43 -0700
Subject: no reason to lazily instantiate the routes

especially if you're just going to add a call two lines down that
populates the cache. common.
---
 actionpack/test/dispatch/prefix_generation_test.rb | 87 +++++++++++-----------
 1 file changed, 42 insertions(+), 45 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index 7cf3559e5d..eda92beae1 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -25,34 +25,33 @@ module TestGenerationPrefix
     include Rack::Test::Methods
 
     class BlogEngine < Rails::Engine
-      def self.routes
-        @routes ||= begin
-          routes = ActionDispatch::Routing::RouteSet.new
-          routes.draw do
-            get "/posts/:id", :to => "inside_engine_generating#show", :as => :post
-            get "/posts", :to => "inside_engine_generating#index", :as => :posts
-            get "/url_to_application", :to => "inside_engine_generating#url_to_application"
-            get "/polymorphic_path_for_engine", :to => "inside_engine_generating#polymorphic_path_for_engine"
-            get "/conflicting_url", :to => "inside_engine_generating#conflicting"
-            get "/foo", :to => "never#invoked", :as => :named_helper_that_should_be_invoked_only_in_respond_to_test
-
-            get "/relative_path_root",       :to => redirect("")
-            get "/relative_path_redirect",   :to => redirect("foo")
-            get "/relative_option_root",     :to => redirect(:path => "")
-            get "/relative_option_redirect", :to => redirect(:path => "foo")
-            get "/relative_custom_root",     :to => redirect { |params, request| "" }
-            get "/relative_custom_redirect", :to => redirect { |params, request| "foo" }
-
-            get "/absolute_path_root",       :to => redirect("/")
-            get "/absolute_path_redirect",   :to => redirect("/foo")
-            get "/absolute_option_root",     :to => redirect(:path => "/")
-            get "/absolute_option_redirect", :to => redirect(:path => "/foo")
-            get "/absolute_custom_root",     :to => redirect { |params, request| "/" }
-            get "/absolute_custom_redirect", :to => redirect { |params, request| "/foo" }
-          end
-
-          routes
+      @routes = ActionDispatch::Routing::RouteSet.new.tap { |routes|
+        routes.draw do
+          get "/posts/:id", :to => "inside_engine_generating#show", :as => :post
+          get "/posts", :to => "inside_engine_generating#index", :as => :posts
+          get "/url_to_application", :to => "inside_engine_generating#url_to_application"
+          get "/polymorphic_path_for_engine", :to => "inside_engine_generating#polymorphic_path_for_engine"
+          get "/conflicting_url", :to => "inside_engine_generating#conflicting"
+          get "/foo", :to => "never#invoked", :as => :named_helper_that_should_be_invoked_only_in_respond_to_test
+
+          get "/relative_path_root",       :to => redirect("")
+          get "/relative_path_redirect",   :to => redirect("foo")
+          get "/relative_option_root",     :to => redirect(:path => "")
+          get "/relative_option_redirect", :to => redirect(:path => "foo")
+          get "/relative_custom_root",     :to => redirect { |params, request| "" }
+          get "/relative_custom_redirect", :to => redirect { |params, request| "foo" }
+
+          get "/absolute_path_root",       :to => redirect("/")
+          get "/absolute_path_redirect",   :to => redirect("/foo")
+          get "/absolute_option_root",     :to => redirect(:path => "/")
+          get "/absolute_option_redirect", :to => redirect(:path => "/foo")
+          get "/absolute_custom_root",     :to => redirect { |params, request| "/" }
+          get "/absolute_custom_redirect", :to => redirect { |params, request| "/foo" }
         end
+      }
+
+      def self.routes
+        @routes
       end
 
       def self.call(env)
@@ -62,25 +61,24 @@ module TestGenerationPrefix
     end
 
     class RailsApplication
-      def self.routes
-        @routes ||= begin
-          routes = ActionDispatch::Routing::RouteSet.new
-          routes.draw do
-            scope "/:omg", :omg => "awesome" do
-              mount BlogEngine => "/blog", :as => "blog_engine"
-            end
-            get "/posts/:id", :to => "outside_engine_generating#post", :as => :post
-            get "/generate", :to => "outside_engine_generating#index"
-            get "/polymorphic_path_for_app", :to => "outside_engine_generating#polymorphic_path_for_app"
-            get "/polymorphic_path_for_engine", :to => "outside_engine_generating#polymorphic_path_for_engine"
-            get "/polymorphic_with_url_for", :to => "outside_engine_generating#polymorphic_with_url_for"
-            get "/conflicting_url", :to => "outside_engine_generating#conflicting"
-            get "/ivar_usage", :to => "outside_engine_generating#ivar_usage"
-            root :to => "outside_engine_generating#index"
+      @routes = ActionDispatch::Routing::RouteSet.new.tap { |routes|
+        routes.draw do
+          scope "/:omg", :omg => "awesome" do
+            mount BlogEngine => "/blog", :as => "blog_engine"
           end
-
-          routes
+          get "/posts/:id", :to => "outside_engine_generating#post", :as => :post
+          get "/generate", :to => "outside_engine_generating#index"
+          get "/polymorphic_path_for_app", :to => "outside_engine_generating#polymorphic_path_for_app"
+          get "/polymorphic_path_for_engine", :to => "outside_engine_generating#polymorphic_path_for_engine"
+          get "/polymorphic_with_url_for", :to => "outside_engine_generating#polymorphic_with_url_for"
+          get "/conflicting_url", :to => "outside_engine_generating#conflicting"
+          get "/ivar_usage", :to => "outside_engine_generating#ivar_usage"
+          root :to => "outside_engine_generating#index"
         end
+      }
+
+      def self.routes
+        @routes
       end
 
       def self.call(env)
@@ -90,7 +88,6 @@ module TestGenerationPrefix
     end
 
     # force draw
-    RailsApplication.routes
     RailsApplication.routes.define_mounted_helper(:main_app)
 
     class ::InsideEngineGeneratingController < ActionController::Base
-- 
cgit v1.2.3


From 9a36fac810246dad32fb4b88619dda805315d5e7 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 5 Aug 2014 16:30:08 -0700
Subject: a rails application should be an engine subclass

---
 actionpack/test/dispatch/prefix_generation_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index eda92beae1..060d76748a 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -60,7 +60,7 @@ module TestGenerationPrefix
       end
     end
 
-    class RailsApplication
+    class RailsApplication < Rails::Engine
       @routes = ActionDispatch::Routing::RouteSet.new.tap { |routes|
         routes.draw do
           scope "/:omg", :omg => "awesome" do
-- 
cgit v1.2.3


From acb371ca3fbbe3123d8d5b411ae2f2fb0b51ed7b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 5 Aug 2014 16:50:50 -0700
Subject: call the routes method on engines

if we access the instance, we can free up lots of codes
---
 actionpack/test/dispatch/prefix_generation_test.rb | 111 +++++++--------------
 1 file changed, 37 insertions(+), 74 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index 060d76748a..f90d5499d7 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -25,65 +25,43 @@ module TestGenerationPrefix
     include Rack::Test::Methods
 
     class BlogEngine < Rails::Engine
-      @routes = ActionDispatch::Routing::RouteSet.new.tap { |routes|
-        routes.draw do
-          get "/posts/:id", :to => "inside_engine_generating#show", :as => :post
-          get "/posts", :to => "inside_engine_generating#index", :as => :posts
-          get "/url_to_application", :to => "inside_engine_generating#url_to_application"
-          get "/polymorphic_path_for_engine", :to => "inside_engine_generating#polymorphic_path_for_engine"
-          get "/conflicting_url", :to => "inside_engine_generating#conflicting"
-          get "/foo", :to => "never#invoked", :as => :named_helper_that_should_be_invoked_only_in_respond_to_test
-
-          get "/relative_path_root",       :to => redirect("")
-          get "/relative_path_redirect",   :to => redirect("foo")
-          get "/relative_option_root",     :to => redirect(:path => "")
-          get "/relative_option_redirect", :to => redirect(:path => "foo")
-          get "/relative_custom_root",     :to => redirect { |params, request| "" }
-          get "/relative_custom_redirect", :to => redirect { |params, request| "foo" }
-
-          get "/absolute_path_root",       :to => redirect("/")
-          get "/absolute_path_redirect",   :to => redirect("/foo")
-          get "/absolute_option_root",     :to => redirect(:path => "/")
-          get "/absolute_option_redirect", :to => redirect(:path => "/foo")
-          get "/absolute_custom_root",     :to => redirect { |params, request| "/" }
-          get "/absolute_custom_redirect", :to => redirect { |params, request| "/foo" }
-        end
-      }
-
-      def self.routes
-        @routes
-      end
-
-      def self.call(env)
-        env['action_dispatch.routes'] = routes
-        routes.call(env)
+      routes.draw do
+        get "/posts/:id", :to => "inside_engine_generating#show", :as => :post
+        get "/posts", :to => "inside_engine_generating#index", :as => :posts
+        get "/url_to_application", :to => "inside_engine_generating#url_to_application"
+        get "/polymorphic_path_for_engine", :to => "inside_engine_generating#polymorphic_path_for_engine"
+        get "/conflicting_url", :to => "inside_engine_generating#conflicting"
+        get "/foo", :to => "never#invoked", :as => :named_helper_that_should_be_invoked_only_in_respond_to_test
+
+        get "/relative_path_root",       :to => redirect("")
+        get "/relative_path_redirect",   :to => redirect("foo")
+        get "/relative_option_root",     :to => redirect(:path => "")
+        get "/relative_option_redirect", :to => redirect(:path => "foo")
+        get "/relative_custom_root",     :to => redirect { |params, request| "" }
+        get "/relative_custom_redirect", :to => redirect { |params, request| "foo" }
+
+        get "/absolute_path_root",       :to => redirect("/")
+        get "/absolute_path_redirect",   :to => redirect("/foo")
+        get "/absolute_option_root",     :to => redirect(:path => "/")
+        get "/absolute_option_redirect", :to => redirect(:path => "/foo")
+        get "/absolute_custom_root",     :to => redirect { |params, request| "/" }
+        get "/absolute_custom_redirect", :to => redirect { |params, request| "/foo" }
       end
     end
 
     class RailsApplication < Rails::Engine
-      @routes = ActionDispatch::Routing::RouteSet.new.tap { |routes|
-        routes.draw do
-          scope "/:omg", :omg => "awesome" do
-            mount BlogEngine => "/blog", :as => "blog_engine"
-          end
-          get "/posts/:id", :to => "outside_engine_generating#post", :as => :post
-          get "/generate", :to => "outside_engine_generating#index"
-          get "/polymorphic_path_for_app", :to => "outside_engine_generating#polymorphic_path_for_app"
-          get "/polymorphic_path_for_engine", :to => "outside_engine_generating#polymorphic_path_for_engine"
-          get "/polymorphic_with_url_for", :to => "outside_engine_generating#polymorphic_with_url_for"
-          get "/conflicting_url", :to => "outside_engine_generating#conflicting"
-          get "/ivar_usage", :to => "outside_engine_generating#ivar_usage"
-          root :to => "outside_engine_generating#index"
+      routes.draw do
+        scope "/:omg", :omg => "awesome" do
+          mount BlogEngine => "/blog", :as => "blog_engine"
         end
-      }
-
-      def self.routes
-        @routes
-      end
-
-      def self.call(env)
-        env['action_dispatch.routes'] = routes
-        routes.call(env)
+        get "/posts/:id", :to => "outside_engine_generating#post", :as => :post
+        get "/generate", :to => "outside_engine_generating#index"
+        get "/polymorphic_path_for_app", :to => "outside_engine_generating#polymorphic_path_for_app"
+        get "/polymorphic_path_for_engine", :to => "outside_engine_generating#polymorphic_path_for_engine"
+        get "/polymorphic_with_url_for", :to => "outside_engine_generating#polymorphic_with_url_for"
+        get "/conflicting_url", :to => "outside_engine_generating#conflicting"
+        get "/ivar_usage", :to => "outside_engine_generating#ivar_usage"
+        root :to => "outside_engine_generating#index"
       end
     end
 
@@ -159,7 +137,7 @@ module TestGenerationPrefix
     end
 
     def app
-      RailsApplication
+      RailsApplication.instance
     end
 
     attr_reader :engine_object, :app_object
@@ -389,27 +367,12 @@ module TestGenerationPrefix
       end
     end
 
-    class RailsApplication
-      def self.routes
-        @routes ||= begin
-          routes = ActionDispatch::Routing::RouteSet.new
-          routes.draw do
-            mount BlogEngine => "/"
-          end
-
-          routes
-        end
-      end
-
-      def self.call(env)
-        env['action_dispatch.routes'] = routes
-        routes.call(env)
+    class RailsApplication < Rails::Engine
+      routes.draw do
+        mount BlogEngine => "/"
       end
     end
 
-    # force draw
-    RailsApplication.routes
-
     class ::PostsController < ActionController::Base
       include BlogEngine.routes.url_helpers
       include RailsApplication.routes.mounted_helpers
@@ -420,7 +383,7 @@ module TestGenerationPrefix
     end
 
     def app
-      RailsApplication
+      RailsApplication.instance
     end
 
     test "generating path inside engine" do
-- 
cgit v1.2.3


From 4c30b4fc215585b93f87ac68e466ca477b10e7e0 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 7 Aug 2014 23:09:29 +0800
Subject: Fix spelling.

---
 actionpack/test/controller/test_case_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 3b3b15c061..a9ed5021bb 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -221,7 +221,7 @@ XML
     assert_equal 200, @response.status
   end
 
-  def test_head_params_as_sting
+  def test_head_params_as_string
     assert_raise(NoMethodError) { head :test_params, "document body", :id => 10 }
   end
 
-- 
cgit v1.2.3


From aaef6a3860e3952faf551d25076f42ea7f6ff426 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 8 Aug 2014 12:29:52 +0800
Subject: Fixes to TestCaseTest.

---
 actionpack/test/controller/test_case_test.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index a9ed5021bb..060c940100 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -713,6 +713,7 @@ XML
   def test_header_properly_reset_after_remote_http_request
     xhr :get, :test_params
     assert_nil @request.env['HTTP_X_REQUESTED_WITH']
+    assert_nil @request.env['HTTP_ACCEPT']
   end
 
   def test_header_properly_reset_after_get_request
@@ -721,10 +722,10 @@ XML
     assert_nil @request.instance_variable_get("@request_method")
   end
 
-  def test_params_reset_after_post_request
+  def test_params_reset_between_post_requests
     post :no_op, :foo => "bar"
     assert_equal "bar", @request.params[:foo]
-    @request.recycle!
+
     post :no_op
     assert @request.params[:foo].blank?
   end
@@ -737,10 +738,10 @@ XML
     assert_equal "baz", @request.filtered_parameters[:foo]
   end
 
-  def test_path_params_reset_after_request
+  def test_path_params_reset_between_request
     get :test_params, :id => "foo"
     assert_equal "foo", @request.path_parameters[:id]
-    @request.recycle!
+
     get :test_params
     assert_nil @request.path_parameters[:id]
   end
-- 
cgit v1.2.3


From cfbedd3479d5021b9fb862ecfa49fc6bc8602994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?=
 <lukasz.strzalkowski@gmail.com>
Date: Fri, 8 Aug 2014 21:18:30 +0200
Subject: Add config option for cookies digest

You can now configure custom digest for cookies in the same way as `serializer`:

config.action_dispatch.cookies_digest = \SHA256'
---
 actionpack/test/dispatch/cookies_test.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 0f145666d1..744143fc2c 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -369,6 +369,23 @@ class CookiesTest < ActionController::TestCase
     assert_equal 'Jamie', @controller.send(:cookies).permanent[:user_name]
   end
 
+  def test_signed_cookie_using_default_digest
+    get :set_signed_cookie
+    cookies = @controller.send :cookies
+    assert_not_equal 45, cookies[:user_id]
+    assert_equal 45, cookies.signed[:user_id]
+    assert_equal 'SHA1', cookies.signed.instance_variable_get(:"@verifier").instance_variable_get(:"@digest")
+  end
+
+  def test_signed_cookie_using_custom_digest
+    @request.env["action_dispatch.cookies_digest"] = 'SHA256'
+    get :set_signed_cookie
+    cookies = @controller.send :cookies
+    assert_not_equal 45, cookies[:user_id]
+    assert_equal 45, cookies.signed[:user_id]
+    assert_equal 'SHA256', cookies.signed.instance_variable_get(:"@verifier").instance_variable_get(:"@digest")
+  end
+
   def test_signed_cookie_using_default_serializer
     get :set_signed_cookie
     cookies = @controller.send :cookies
-- 
cgit v1.2.3


From d70ba48c4dd6b57d8f38612ea95a3842337c1419 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 8 Aug 2014 18:20:17 -0300
Subject: Revert "Merge pull request #16434 from
 strzalek/cookies-digest-config-option"

This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing
changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699.

IT BROKE THE BUILD!!!
---
 actionpack/test/dispatch/cookies_test.rb | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 744143fc2c..0f145666d1 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -369,23 +369,6 @@ class CookiesTest < ActionController::TestCase
     assert_equal 'Jamie', @controller.send(:cookies).permanent[:user_name]
   end
 
-  def test_signed_cookie_using_default_digest
-    get :set_signed_cookie
-    cookies = @controller.send :cookies
-    assert_not_equal 45, cookies[:user_id]
-    assert_equal 45, cookies.signed[:user_id]
-    assert_equal 'SHA1', cookies.signed.instance_variable_get(:"@verifier").instance_variable_get(:"@digest")
-  end
-
-  def test_signed_cookie_using_custom_digest
-    @request.env["action_dispatch.cookies_digest"] = 'SHA256'
-    get :set_signed_cookie
-    cookies = @controller.send :cookies
-    assert_not_equal 45, cookies[:user_id]
-    assert_equal 45, cookies.signed[:user_id]
-    assert_equal 'SHA256', cookies.signed.instance_variable_get(:"@verifier").instance_variable_get(:"@digest")
-  end
-
   def test_signed_cookie_using_default_serializer
     get :set_signed_cookie
     cookies = @controller.send :cookies
-- 
cgit v1.2.3


From 6ffb29d24e05abbd9ffe3ea974140d6c70221807 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Tue, 12 Aug 2014 19:30:05 +0900
Subject: 
 users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent!

Calling ActiveSupport::TestCase.i_suck_and_my_tests_are_order_dependent! in AS::TestCase makes
everyone's tests order dependent, which should never be done by the framework.
---
 actionpack/test/abstract_unit.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 4e17d57dad..08f8f64123 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -497,3 +497,8 @@ if ActiveSupport::Testing::Isolation.forking_env? && PROCESS_COUNT > 0
   # Use N processes (N defaults to 4)
   Minitest.parallel_executor = ForkingExecutor.new(PROCESS_COUNT)
 end
+
+# FIXME: we have tests that depend on run order, we should fix that and
+# remove this method call.
+require 'active_support/test_case'
+ActiveSupport::TestCase.i_suck_and_my_tests_are_order_dependent!
-- 
cgit v1.2.3


From e81f3c210eca074ed6227bd1c40835d44761c09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 12 Aug 2014 10:51:41 -0300
Subject: Nobody sucks so nobody should call this awful method name

---
 actionpack/test/abstract_unit.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 08f8f64123..376add06ca 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -501,4 +501,4 @@ end
 # FIXME: we have tests that depend on run order, we should fix that and
 # remove this method call.
 require 'active_support/test_case'
-ActiveSupport::TestCase.i_suck_and_my_tests_are_order_dependent!
+ActiveSupport::TestCase.my_tests_are_order_dependent!
-- 
cgit v1.2.3