From 3cc25864e34fb5b22b1ecacaaf91825841a5eebd Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Mon, 6 Oct 2014 12:33:07 +0800
Subject: Allow authentication header to not have to specify 'token=' key.

Fixes: https://github.com/rails/rails/issues/17108.
---
 .../controller/http_token_authentication_test.rb   | 23 ++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/http_token_authentication_test.rb b/actionpack/test/controller/http_token_authentication_test.rb
index 8c6c8a0aa7..a758df2ec6 100644
--- a/actionpack/test/controller/http_token_authentication_test.rb
+++ b/actionpack/test/controller/http_token_authentication_test.rb
@@ -162,17 +162,36 @@ class HttpTokenAuthenticationTest < ActionController::TestCase
     assert_equal(expected, actual)
   end
 
+  test "token_and_options returns right token when token key is not specified in header" do
+    token = "rcHu+HzSFw89Ypyhn/896A="
+
+    actual = ActionController::HttpAuthentication::Token.token_and_options(
+      sample_request_without_token_key(token)
+    ).first
+
+    expected = token
+    assert_equal(expected, actual)
+  end
+
   private
 
     def sample_request(token, options = {nonce: "def"})
       authorization = options.inject([%{Token token="#{token}"}]) do |arr, (k, v)|
         arr << "#{k}=\"#{v}\""
       end.join(", ")
-      @sample_request ||= OpenStruct.new authorization: authorization
+      mock_authorization_request(authorization)
     end
 
     def malformed_request
-      @malformed_request ||= OpenStruct.new authorization: %{Token token=}
+      mock_authorization_request(%{Token token=})
+    end
+
+    def sample_request_without_token_key(token)
+      mock_authorization_request(%{Token #{token}})
+    end
+
+    def mock_authorization_request(authorization)
+      OpenStruct.new(authorization: authorization)
     end
 
     def encode_credentials(token, options = {})
-- 
cgit v1.2.3


From 76f5a9afb35e52bbdc392d6fc35422e22be987c2 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 5 Nov 2014 23:38:02 +0800
Subject: Remove session to allow `with_routing` to be called twice.

Fixes: https://github.com/rails/rails/issues/16814
---
 actionpack/test/abstract_unit.rb               |  1 +
 actionpack/test/controller/integration_test.rb | 36 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 69312e4c22..63c9ab04c9 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -194,6 +194,7 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
     yield temporary_routes
   ensure
     self.class.app = old_app
+    self.remove!
     silence_warnings { Object.const_set(:SharedTestRoutes, old_routes) }
   end
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index d91a1657b3..27b30536b0 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -814,3 +814,39 @@ class HeadWithStatusActionIntegrationTest < ActionDispatch::IntegrationTest
     assert_response :ok
   end
 end
+
+class IntegrationWithRoutingTest < ActionDispatch::IntegrationTest
+  class FooController < ActionController::Base
+    def index
+      render plain: 'ok'
+    end
+  end
+
+  def test_with_routing_resets_session
+    klass_namespace = self.class.name.underscore
+
+    with_routing do |routes|
+      routes.draw do
+        namespace klass_namespace do
+          resources :foo, path: '/with'
+        end
+      end
+
+      get '/integration_with_routing_test/with'
+      assert_response 200
+      assert_equal 'ok', response.body
+    end
+
+    with_routing do |routes|
+      routes.draw do
+        namespace klass_namespace do
+          resources :foo, path: '/routing'
+        end
+      end
+
+      get '/integration_with_routing_test/routing'
+      assert_response 200
+      assert_equal 'ok', response.body
+    end
+  end
+end
-- 
cgit v1.2.3


From aa6637d140c2ebd28bbd23fc250af033a065dbe8 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 10 Nov 2014 00:30:08 -0800
Subject: Pass the route name explicitly

Follow up to 212057b9. Since that commit, we need to pass the `route_name`
explicitly. This is one of the left-over cases that was not handled in that
commit, which was causing `use_route` to be ignored in functional tests.
---
 actionpack/test/controller/test_case_test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 9d7abd5e94..957c0a5288 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -499,6 +499,18 @@ XML
     end
   end
 
+  def test_use_route
+    with_routing do |set|
+      set.draw do
+        get 'via_unnamed_route', to: 'test_case_test/test#test_uri'
+        get 'via_named_route', as: :a_named_route, to: 'test_case_test/test#test_uri'
+      end
+
+      get :test_uri, use_route: :a_named_route
+      assert_equal '/via_named_route', @response.body
+    end
+  end
+
   def test_assert_realistic_path_parameters
     get :test_params, :id => 20, :foo => Object.new
 
-- 
cgit v1.2.3


From 6625000b73f520abf6e0afbd5a6dde8d6b06b7cc Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 10 Nov 2014 00:47:25 -0800
Subject: Remove useless `only_path: true` in path helpers

We added a deprecation warning for these cases in aa1fadd, so these are now
causing deprecation warnings in the test output. AFAICT, in these two cases, the
option is not integral to the purpose of the test, so they can be safely removed
---
 actionpack/test/controller/url_for_test.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 969129d9ba..c05cde87e4 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -25,8 +25,7 @@ module AbstractController
 
         path = klass.new.fun_path({:controller => :articles,
                                    :baz        => "baz",
-                                   :zot        => "zot",
-                                   :only_path  => true })
+                                   :zot        => "zot"})
         # :bar key isn't provided
         assert_equal '/foo/zot', path
       end
@@ -291,7 +290,7 @@ module AbstractController
           assert_equal '/brave/new/world',
             controller.url_for(:controller => 'brave', :action => 'new', :id => 'world', :only_path => true)
 
-          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(:user => 'alabama', :host => 'unused'))
           assert_equal("/home/sweet/home/alabama", controller.home_path('alabama'))
         end
       end
-- 
cgit v1.2.3


From 3c60fb429d9e4271bce3a71b0f5fb4bb2f7fbe2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafael.franca@plataformatec.com.br>
Date: Tue, 11 Nov 2014 01:04:06 -0200
Subject: Make FlashHash#key? work with symbol and string

Closes #17586
---
 actionpack/test/controller/flash_hash_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/flash_hash_test.rb b/actionpack/test/controller/flash_hash_test.rb
index 50b36a0567..d979b561f2 100644
--- a/actionpack/test/controller/flash_hash_test.rb
+++ b/actionpack/test/controller/flash_hash_test.rb
@@ -29,6 +29,15 @@ module ActionDispatch
       assert_equal 'world', @hash['hello']
     end
 
+    def test_key
+      @hash['foo'] = 'bar'
+
+      assert @hash.key?('foo')
+      assert @hash.key?(:foo)
+      assert_not @hash.key?('bar')
+      assert_not @hash.key?(:bar)
+    end
+
     def test_delete
       @hash['foo'] = 'bar'
       @hash.delete 'foo'
-- 
cgit v1.2.3


From 50079298260a8a406713a309524b29552ceec270 Mon Sep 17 00:00:00 2001
From: Genadi Samokovarov <gsamokovarov@gmail.com>
Date: Thu, 13 Nov 2014 23:25:33 +0100
Subject: Add basic tests for ActionDispatch::ExceptionWrapper

---
 actionpack/test/dispatch/exception_wrapper_test.rb | 66 ++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 actionpack/test/dispatch/exception_wrapper_test.rb

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/exception_wrapper_test.rb b/actionpack/test/dispatch/exception_wrapper_test.rb
new file mode 100644
index 0000000000..3ddaa7294b
--- /dev/null
+++ b/actionpack/test/dispatch/exception_wrapper_test.rb
@@ -0,0 +1,66 @@
+require 'abstract_unit'
+
+module ActionDispatch
+  class ExceptionWrapperTest < ActionDispatch::IntegrationTest
+    class TestError < StandardError
+      attr_reader :backtrace
+
+      def initialize(*backtrace)
+        @backtrace = backtrace.flatten
+      end
+    end
+
+    setup do
+      Rails.stubs(:root).returns(Pathname.new('.'))
+
+      cleaner = ActiveSupport::BacktraceCleaner.new
+      cleaner.add_silencer { |line| line !~ /^lib/ }
+
+      @environment = { 'action_dispatch.backtrace_cleaner' => cleaner }
+    end
+
+    test '#source_extract fetches source fragments for every backtrace entry' do
+      exception = TestError.new("lib/file.rb:42:in `index'")
+      wrapper = ExceptionWrapper.new({}, exception)
+
+      wrapper.expects(:source_fragment).with('lib/file.rb', 42).returns('foo')
+
+      assert_equal [ code: 'foo', file: 'lib/file.rb', line_number: 42 ], wrapper.source_extract
+    end
+
+    test '#application_trace returns traces only from the application' do
+      exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
+      wrapper = ExceptionWrapper.new(@environment, exception)
+
+      assert_equal [ "lib/file.rb:42:in `index'" ], wrapper.application_trace
+    end
+
+    test '#framework_trace returns traces outside the application' do
+      exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
+      wrapper = ExceptionWrapper.new(@environment, exception)
+
+      assert_equal caller, wrapper.framework_trace
+    end
+
+    test '#full_trace returns application and framework traces' do
+      exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
+      wrapper = ExceptionWrapper.new(@environment, exception)
+
+      assert_equal exception.backtrace, wrapper.full_trace
+    end
+
+    test '#traces returns every trace by category enumerated with an index' do
+      exception = TestError.new("lib/file.rb:42:in `index'", "/gems/rack.rb:43:in `index'")
+      wrapper = ExceptionWrapper.new(@environment, exception)
+
+      assert_equal({
+        'Application Trace' => [ id: 0, trace: "lib/file.rb:42:in `index'" ],
+        'Framework Trace' => [ id: 1, trace: "/gems/rack.rb:43:in `index'" ],
+        'Full Trace' => [
+          { id: 0, trace: "lib/file.rb:42:in `index'" },
+          { id: 1, trace: "/gems/rack.rb:43:in `index'" }
+        ]
+      }, wrapper.traces)
+    end
+  end
+end
-- 
cgit v1.2.3


From e05714fdbc4d6a767f207b08a94ba3ebf147213e Mon Sep 17 00:00:00 2001
From: Genadi Samokovarov <gsamokovarov@gmail.com>
Date: Sun, 16 Nov 2014 17:17:06 +0200
Subject: Don't let #{application,framework,full}_trace be nil

Those three can be nil when exception backtrace is nil. This happens and
that forced a couple of nil guards in the code. I'm proposing to make
those always return an array, even on nil backtrace.
---
 actionpack/test/dispatch/exception_wrapper_test.rb | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/exception_wrapper_test.rb b/actionpack/test/dispatch/exception_wrapper_test.rb
index 3ddaa7294b..57292d3191 100644
--- a/actionpack/test/dispatch/exception_wrapper_test.rb
+++ b/actionpack/test/dispatch/exception_wrapper_test.rb
@@ -10,6 +10,12 @@ module ActionDispatch
       end
     end
 
+    class BadlyDefinedError < StandardError
+      def backtrace
+        nil
+      end
+    end
+
     setup do
       Rails.stubs(:root).returns(Pathname.new('.'))
 
@@ -28,6 +34,7 @@ module ActionDispatch
       assert_equal [ code: 'foo', file: 'lib/file.rb', line_number: 42 ], wrapper.source_extract
     end
 
+
     test '#application_trace returns traces only from the application' do
       exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
       wrapper = ExceptionWrapper.new(@environment, exception)
@@ -35,6 +42,14 @@ module ActionDispatch
       assert_equal [ "lib/file.rb:42:in `index'" ], wrapper.application_trace
     end
 
+    test '#application_trace cannot be nil' do
+      nil_backtrace_wrapper = ExceptionWrapper.new(@environment, BadlyDefinedError.new)
+      nil_cleaner_wrapper = ExceptionWrapper.new({}, BadlyDefinedError.new)
+
+      assert_equal [], nil_backtrace_wrapper.application_trace
+      assert_equal [], nil_cleaner_wrapper.application_trace
+    end
+
     test '#framework_trace returns traces outside the application' do
       exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
       wrapper = ExceptionWrapper.new(@environment, exception)
@@ -42,6 +57,14 @@ module ActionDispatch
       assert_equal caller, wrapper.framework_trace
     end
 
+    test '#framework_trace cannot be nil' do
+      nil_backtrace_wrapper = ExceptionWrapper.new(@environment, BadlyDefinedError.new)
+      nil_cleaner_wrapper = ExceptionWrapper.new({}, BadlyDefinedError.new)
+
+      assert_equal [], nil_backtrace_wrapper.framework_trace
+      assert_equal [], nil_cleaner_wrapper.framework_trace
+    end
+
     test '#full_trace returns application and framework traces' do
       exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
       wrapper = ExceptionWrapper.new(@environment, exception)
@@ -49,6 +72,14 @@ module ActionDispatch
       assert_equal exception.backtrace, wrapper.full_trace
     end
 
+    test '#full_trace cannot be nil' do
+      nil_backtrace_wrapper = ExceptionWrapper.new(@environment, BadlyDefinedError.new)
+      nil_cleaner_wrapper = ExceptionWrapper.new({}, BadlyDefinedError.new)
+
+      assert_equal [], nil_backtrace_wrapper.full_trace
+      assert_equal [], nil_cleaner_wrapper.full_trace
+    end
+
     test '#traces returns every trace by category enumerated with an index' do
       exception = TestError.new("lib/file.rb:42:in `index'", "/gems/rack.rb:43:in `index'")
       wrapper = ExceptionWrapper.new(@environment, exception)
-- 
cgit v1.2.3


From 20ad04e5fcfd5b972bfffb6c47b44646c41b8a82 Mon Sep 17 00:00:00 2001
From: Genadi Samokovarov <gsamokovarov@gmail.com>
Date: Mon, 3 Nov 2014 22:59:45 +0200
Subject: Rename #source_extract to #source_extracts in ExceptionWrapper

It returns multiple source extracts since 1ed264bc. Also cleaned its
result structure, as we no longer need the file in a code extract.
---
 actionpack/test/dispatch/exception_wrapper_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/exception_wrapper_test.rb b/actionpack/test/dispatch/exception_wrapper_test.rb
index 57292d3191..d7408164ba 100644
--- a/actionpack/test/dispatch/exception_wrapper_test.rb
+++ b/actionpack/test/dispatch/exception_wrapper_test.rb
@@ -25,13 +25,13 @@ module ActionDispatch
       @environment = { 'action_dispatch.backtrace_cleaner' => cleaner }
     end
 
-    test '#source_extract fetches source fragments for every backtrace entry' do
+    test '#source_extracts fetches source fragments for every backtrace entry' do
       exception = TestError.new("lib/file.rb:42:in `index'")
       wrapper = ExceptionWrapper.new({}, exception)
 
       wrapper.expects(:source_fragment).with('lib/file.rb', 42).returns('foo')
 
-      assert_equal [ code: 'foo', file: 'lib/file.rb', line_number: 42 ], wrapper.source_extract
+      assert_equal [ code: 'foo', line_number: 42 ], wrapper.source_extracts
     end
 
 
-- 
cgit v1.2.3


From c3e8d15e8babd8c27aa04ced8cde40fdc124416a Mon Sep 17 00:00:00 2001
From: Calvin Correli <calvin@correli.me>
Date: Wed, 12 Nov 2014 13:06:18 +0100
Subject: Fix for assigns(:..) resetting template assertions

When calling assigns(:...) or cookies(:...), template assertions would be reset, which they obviously shouldn't be.
---
 actionpack/test/dispatch/template_assertions_test.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/template_assertions_test.rb b/actionpack/test/dispatch/template_assertions_test.rb
index 3c393f937b..7278754b49 100644
--- a/actionpack/test/dispatch/template_assertions_test.rb
+++ b/actionpack/test/dispatch/template_assertions_test.rb
@@ -10,7 +10,7 @@ class AssertTemplateController < ActionController::Base
   end
 
   def render_with_layout
-    @variable_for_layout = nil
+    @variable_for_layout = 'hello'
     render 'test/hello_world', layout: "layouts/standard"
   end
 
@@ -95,4 +95,16 @@ class AssertTemplateControllerTest < ActionDispatch::IntegrationTest
       session.assert_template file: nil
     end
   end
+
+  def test_assigns_do_not_reset_template_assertion
+    get '/assert_template/render_with_layout'
+    assert_equal 'hello', assigns(:variable_for_layout)
+    assert_template layout: 'layouts/standard'
+  end
+
+  def test_cookies_do_not_reset_template_assertion
+    get '/assert_template/render_with_layout'
+    cookies
+    assert_template layout: 'layouts/standard'
+  end
 end
-- 
cgit v1.2.3


From 1b9e85dbbd7d974143e67affb3166d7244cc99db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 18 Nov 2014 18:47:22 -0200
Subject: Make sure assert_select can assert body tag

This reverts commit f93df52845766216f0fe36a4586f8abad505cac4, reversing
changes made to a455e3f4e9dbfb9630d47878e1239bc424fb7d13.

Conflicts:
	actionpack/lib/action_controller/test_case.rb
	actionview/lib/action_view/test_case.rb
---
 actionpack/test/controller/integration_test.rb |  6 +++---
 actionpack/test/controller/test_case_test.rb   | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 27b30536b0..d6219b7626 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -292,7 +292,7 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
       assert_equal({}, cookies.to_hash)
       assert_equal "OK", body
       assert_equal "OK", response.body
-      assert_kind_of Nokogiri::HTML::DocumentFragment, html_document
+      assert_kind_of Nokogiri::HTML::Document, html_document
       assert_equal 1, request_count
     end
   end
@@ -308,7 +308,7 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
       assert_equal({}, cookies.to_hash)
       assert_equal "Created", body
       assert_equal "Created", response.body
-      assert_kind_of Nokogiri::HTML::DocumentFragment, html_document
+      assert_kind_of Nokogiri::HTML::Document, html_document
       assert_equal 1, request_count
     end
   end
@@ -368,7 +368,7 @@ class IntegrationProcessTest < ActionDispatch::IntegrationTest
       assert_response :redirect
       assert_response :found
       assert_equal "<html><body>You are being <a href=\"http://www.example.com/get\">redirected</a>.</body></html>", response.body
-      assert_kind_of Nokogiri::HTML::DocumentFragment, html_document
+      assert_kind_of Nokogiri::HTML::Document, html_document
       assert_equal 1, request_count
 
       follow_redirect!
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 957c0a5288..475af90032 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -132,6 +132,14 @@ XML
       render :nothing => true
     end
 
+    def test_without_body
+      render html: '<div class="foo"></div>'.html_safe
+    end
+
+    def test_with_body
+      render html: '<body class="foo"></body>'.html_safe
+    end
+
     private
 
       def generate_url(opts)
@@ -179,6 +187,19 @@ XML
     end
   end
 
+  def test_assert_select_without_body
+    get :test_without_body
+
+    assert_select 'body', 0
+    assert_select 'div.foo'
+  end
+
+  def test_assert_select_with_body
+    get :test_with_body
+
+    assert_select 'body.foo'
+  end
+
   def test_url_options_reset
     @controller = DefaultUrlOptionsCachingController.new
     get :test_url_options_reset
-- 
cgit v1.2.3


From 46041c520809714b3937e7c79c2f220018a4a111 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Sat, 22 Nov 2014 21:42:19 +0800
Subject: Anchor should not be appended when set to nil/false.

Fixes https://github.com/rails/rails/issues/17714.
---
 actionpack/test/controller/routing_test.rb |  3 +++
 actionpack/test/controller/url_for_test.rb | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index c18914cc8e..aca9f03748 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1001,6 +1001,9 @@ class RouteSetTest < ActiveSupport::TestCase
 
     assert_equal "http://test.host/people?baz=bar#location",
       controller.send(:index_url, :baz => "bar", :anchor => 'location')
+
+    assert_equal "http://test.host/people", controller.send(:index_url, anchor: nil)
+    assert_equal "http://test.host/people", controller.send(:index_url, anchor: false)
   end
 
   def test_named_route_url_method_with_port
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index c05cde87e4..f0eba17556 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -54,6 +54,20 @@ module AbstractController
         )
       end
 
+      def test_nil_anchor
+        assert_equal(
+          '/c/a',
+          W.new.url_for(only_path: true, controller: 'c', action: 'a', anchor: nil)
+        )
+      end
+
+      def test_false_anchor
+        assert_equal(
+          '/c/a',
+          W.new.url_for(only_path: true, controller: 'c', action: 'a', anchor: false)
+        )
+      end
+
       def test_anchor_should_call_to_param
         assert_equal('/c/a#anchor',
           W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => Struct.new(:to_param).new('anchor'))
-- 
cgit v1.2.3


From 77a276411e717353bc562c04d62e144f4410e706 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Sun, 23 Nov 2014 00:07:30 -0800
Subject: Test using `ActionController::TestCase` with engines

Reference #17453

[Godfrey Chan, Washington Luiz]
---
 actionpack/test/controller/test_case_test.rb | 52 ++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 475af90032..fdabad3abd 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -1,6 +1,7 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'active_support/json/decoding'
+require 'rails/engine'
 
 class TestCaseTest < ActionController::TestCase
   class TestController < ActionController::Base
@@ -753,6 +754,57 @@ XML
   end
 end
 
+module EngineControllerTests
+  class Engine < ::Rails::Engine
+    isolate_namespace EngineControllerTests
+
+    routes.draw do
+      get '/' => 'bar#index'
+    end
+  end
+
+  class BarController < ActionController::Base
+    def index
+      render :text => 'bar'
+    end
+  end
+
+  class BarControllerTest < ActionController::TestCase
+    tests BarController
+
+    def test_engine_controller_route
+      get :index
+      assert_equal @response.body, 'bar'
+    end
+  end
+
+  class BarControllerTestWithExplicitRouteSet < ActionController::TestCase
+    tests BarController
+
+    def setup
+      @routes = Engine.routes
+    end
+
+    def test_engine_controller_route
+      get :index
+      assert_equal @response.body, 'bar'
+    end
+  end
+
+  class BarControllerTestWithHostApplicationRouteSet < ActionController::TestCase
+    tests BarController
+
+    def test_use_route
+      with_routing do |set|
+        set.draw { mount Engine => '/foo' }
+
+        get :index, use_route: :foo
+        assert_equal @response.body, 'bar'
+      end
+    end
+  end
+end
+
 class InferringClassNameTest < ActionController::TestCase
   def test_determine_controller_class
     assert_equal ContentController, determine_class("ContentControllerTest")
-- 
cgit v1.2.3


From 938d130c62b530d3445c9f06933cb113ff477fed Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Sun, 23 Nov 2014 01:08:53 -0800
Subject: Fix cases where the wrong name is passed to `Formatter#generate`

These are currently working "by accident" because `match_route` does not check
that the name is valid.
---
 actionpack/test/controller/routing_test.rb | 2 +-
 actionpack/test/journey/router_test.rb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index aca9f03748..f46b32e019 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1386,7 +1386,7 @@ class RouteSetTest < ActiveSupport::TestCase
     url = controller.url_for({ :controller => "connection", :only_path => true })
     assert_equal "/connection/connection", url
 
-    url = controller.url_for({ :use_route => :family_connection,
+    url = controller.url_for({ :use_route => "family_connection",
                                :controller => "connection", :only_path => true })
     assert_equal "/connection", url
   end
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index fbac86e8ca..19c61b5914 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -415,7 +415,7 @@ module ActionDispatch
 
       def test_generate_with_name
         path  = Path::Pattern.from_string '/:controller(/:action)'
-        @router.routes.add_route @app, path, {}, {}, {}
+        @router.routes.add_route @app, path, {}, {}, "tasks"
 
         path, params = @formatter.generate(
           "tasks",
-- 
cgit v1.2.3


From 8e73abbda8d3a55459bac728530606fdf69468f5 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Sun, 23 Nov 2014 01:39:17 -0800
Subject: Deprecate `use_route` in controller tests

Reference #17453
---
 actionpack/test/controller/test_case_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index fdabad3abd..ba2ff7d12c 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -528,7 +528,7 @@ XML
         get 'via_named_route', as: :a_named_route, to: 'test_case_test/test#test_uri'
       end
 
-      get :test_uri, use_route: :a_named_route
+      assert_deprecated { get :test_uri, use_route: :a_named_route }
       assert_equal '/via_named_route', @response.body
     end
   end
@@ -798,7 +798,7 @@ module EngineControllerTests
       with_routing do |set|
         set.draw { mount Engine => '/foo' }
 
-        get :index, use_route: :foo
+        assert_deprecated { get :index, use_route: :foo }
         assert_equal @response.body, 'bar'
       end
     end
-- 
cgit v1.2.3


From 1d85c707b633b6ed1623290fa9aff5d7fd74d05e Mon Sep 17 00:00:00 2001
From: Yuki Nishijima <mail@yukinishijima.net>
Date: Sun, 23 Nov 2014 13:04:31 -0800
Subject: Do not rescue Exception in ParamsParser

Unlike ShowExceptions or PublicExceptions, ParamsParser shouldn't
transform exceptions like Interrupt and NoMemoryError into ParserError.
---
 actionpack/test/controller/webservice_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index d80b0e2da0..2b109ff19e 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -83,6 +83,16 @@ class WebServiceTest < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_parsing_json_doesnot_rescue_exception
+    with_test_route_set do
+      with_params_parsers Mime::JSON => Proc.new { |data| raise Interrupt } do
+        assert_raises(Interrupt) do
+          post "/", '{"title":"JSON"}}', 'CONTENT_TYPE' => 'application/json'
+        end
+      end
+    end
+  end
+
   private
     def with_params_parsers(parsers = {})
       old_session = @integration_session
-- 
cgit v1.2.3


From 92ace39692200d088ec70110b980325a27de8fac Mon Sep 17 00:00:00 2001
From: Genadi Samokovarov <gsamokovarov@gmail.com>
Date: Mon, 24 Nov 2014 18:54:03 +0200
Subject: Show source view and backtrace on missing template errors

This will help you debug missing template errors, especially if they
come from a programmatic template selection. Thanks to @dhh for
suggesting that.

As a bonus, also show request and response info on the routing error
page for consistency.
---
 actionpack/test/dispatch/debug_exceptions_test.rb | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index f8851f0152..5e87744f6b 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -43,6 +43,8 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
         raise ActionController::InvalidAuthenticityToken
       when "/not_found_original_exception"
         raise ActionView::Template::Error.new('template', AbstractController::ActionNotFound.new)
+      when "/missing_template"
+        raise ActionView::MissingTemplate.new(%w(foo), 'foo/index', %w(foo), false, 'mailer')
       when "/bad_request"
         raise ActionController::BadRequest
       when "/missing_keys"
@@ -120,6 +122,15 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     assert_no_match '&lt;|&gt;', routing_table, "there should not be escaped html in the output"
   end
 
+  test 'displays request and response info when a RoutingError occurs' do
+    @app = DevelopmentApp
+
+    get "/pass", {}, {'action_dispatch.show_exceptions' => true}
+
+    assert_select 'h2', /Request/
+    assert_select 'h2', /Response/
+  end
+
   test "rescue with diagnostics message" do
     @app = DevelopmentApp
 
@@ -275,6 +286,22 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test 'display backtrace on template missing errors' do
+    @app = DevelopmentApp
+
+    get "/missing_template", nil, {}
+
+    assert_select "header h1", /Template is missing/
+
+    assert_select "#container h2", /^Missing template/
+
+    assert_select '#Application-Trace'
+    assert_select '#Framework-Trace'
+    assert_select '#Full-Trace'
+
+    assert_select 'h2', /Request/
+  end
+
   test 'display backtrace when error type is SyntaxError wrapped by ActionView::Template::Error' do
     @app = DevelopmentApp
 
-- 
cgit v1.2.3


From 4d84922840deb89754f5b5fb61ebea0aeadc52df Mon Sep 17 00:00:00 2001
From: Melanie Gilman <melanie@thoughtbot.com>
Date: Mon, 24 Nov 2014 10:06:16 -0500
Subject: Deprecate string options in URL helpers

Fixes https://github.com/rails/rails/issues/16958

[Byron Bischoff & Melanie Gilman]
---
 actionpack/test/dispatch/routing/route_set_test.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/routing/route_set_test.rb b/actionpack/test/dispatch/routing/route_set_test.rb
index a7acc0de41..5a39119446 100644
--- a/actionpack/test/dispatch/routing/route_set_test.rb
+++ b/actionpack/test/dispatch/routing/route_set_test.rb
@@ -160,6 +160,26 @@ module ActionDispatch
         assert_equal '/foo/1/bar/2', url_helpers.foo_bar_path(2, foo_id: 1)
       end
 
+      test "stringified controller and action keys are properly symbolized" do
+        draw do
+          root 'foo#bar'
+        end
+
+        assert_deprecated do
+          assert_equal '/', url_helpers.root_path('controller' => 'foo', 'action' => 'bar')
+        end
+      end
+
+      test "mix of string and symbol keys are properly symbolized" do
+        draw do
+          root 'foo#bar'
+        end
+
+        assert_deprecated do
+          assert_equal '/', url_helpers.root_path('controller' => 'foo', :action => 'bar')
+        end
+      end
+
       private
         def draw(&block)
           @set.draw(&block)
-- 
cgit v1.2.3


From ad973ab8a0cb268984533f9f61bf1b463d47a066 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 25 Nov 2014 10:29:48 -0200
Subject: Add regression test case to ensure script_name as nil is not used
 anymore in url_for

---
 actionpack/test/controller/url_for_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index f0eba17556..83302d880d 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -290,6 +290,13 @@ module AbstractController
         end
       end
 
+      def test_using_nil_script_name
+        add_host!
+        assert_equal('https://www.basecamphq.com/subdir/c/a/i',
+          W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https', :script_name => nil, :original_script_name => '/subdir')
+        )
+      end
+
       def test_only_path
         with_routing do |set|
           set.draw do
-- 
cgit v1.2.3


From d1374f99bf3090f3e659687c112ed0c5c0865cfb Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Mon, 27 Oct 2014 17:28:53 +0100
Subject: Pass symbol as an argument instead of a block

---
 actionpack/test/abstract_unit.rb           | 2 +-
 actionpack/test/controller/filters_test.rb | 2 +-
 actionpack/test/controller/routing_test.rb | 8 ++++----
 actionpack/test/dispatch/mime_type_test.rb | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 63c9ab04c9..57c076eac6 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -53,7 +53,7 @@ I18n.enforce_available_locales = false
 # Register danish language for testing
 I18n.backend.store_translations 'da', {}
 I18n.backend.store_translations 'pt-BR', {}
-ORIGINAL_LOCALES = I18n.available_locales.map {|locale| locale.to_s }.sort
+ORIGINAL_LOCALES = I18n.available_locales.map(&:to_s).sort
 
 FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
 FIXTURES = Pathname.new(FIXTURE_LOAD_PATH)
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index b2b01b3fa9..38533dbf23 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -10,7 +10,7 @@ class ActionController::Base
 
     def before_actions
       filters = _process_action_callbacks.select { |c| c.kind == :before }
-      filters.map! { |c| c.raw_filter }
+      filters.map!(&:raw_filter)
     end
   end
 
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index f46b32e019..9caa5cbe57 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -884,13 +884,13 @@ class RouteSetTest < ActiveSupport::TestCase
     set.draw { get ':controller/(:action(/:id))' }
     path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
     assert_equal "/foo/bar/15", path
-    assert_equal %w(that this), extras.map { |e| e.to_s }.sort
+    assert_equal %w(that this), extras.map(&:to_s).sort
   end
 
   def test_extra_keys
     set.draw { get ':controller/:action/:id' }
     extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
-    assert_equal %w(that this), extras.map { |e| e.to_s }.sort
+    assert_equal %w(that this), extras.map(&:to_s).sort
   end
 
   def test_generate_extras_not_first
@@ -900,7 +900,7 @@ class RouteSetTest < ActiveSupport::TestCase
     end
     path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
     assert_equal "/foo/bar/15", path
-    assert_equal %w(that this), extras.map { |e| e.to_s }.sort
+    assert_equal %w(that this), extras.map(&:to_s).sort
   end
 
   def test_generate_not_first
@@ -918,7 +918,7 @@ class RouteSetTest < ActiveSupport::TestCase
       get ':controller/:action/:id'
     end
     extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world")
-    assert_equal %w(that this), extras.map { |e| e.to_s }.sort
+    assert_equal %w(that this), extras.map(&:to_s).sort
   end
 
   def test_draw
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index ad6335f132..3017a9c2d6 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -83,7 +83,7 @@ class MimeTypeTest < ActiveSupport::TestCase
   test "parse broken acceptlines" do
     accept = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/*,,*/*;q=0.5"
     expect = [Mime::HTML, Mime::XML, "image/*", Mime::TEXT, Mime::ALL]
-    assert_equal expect, Mime::Type.parse(accept).collect { |c| c.to_s }
+    assert_equal expect, Mime::Type.parse(accept).collect(&:to_s)
   end
 
   # Accept header send with user HTTP_USER_AGENT: Mozilla/4.0
@@ -91,7 +91,7 @@ class MimeTypeTest < ActiveSupport::TestCase
   test "parse other broken acceptlines" do
     accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword,  , pronto/1.00.00, sslvpn/1.00.00.00, */*"
     expect = ['image/gif', 'image/x-xbitmap', 'image/jpeg','image/pjpeg', 'application/x-shockwave-flash', 'application/vnd.ms-excel', 'application/vnd.ms-powerpoint', 'application/msword', 'pronto/1.00.00', 'sslvpn/1.00.00.00', Mime::ALL]
-    assert_equal expect, Mime::Type.parse(accept).collect { |c| c.to_s }
+    assert_equal expect, Mime::Type.parse(accept).collect(&:to_s)
   end
 
   test "custom type" do
-- 
cgit v1.2.3


From f413cbee8dd702e2cae550c04b16e6c98411aeab Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Fri, 28 Nov 2014 14:58:10 -0500
Subject: Pure rack apps can be mounted with a name

See https://github.com/rails/rails/commit/9b15828b5c347395b42066a588c88e5eb4e72279#commitcomment-8764492
---
 actionpack/test/dispatch/routing/inspector_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
index ff33dd5652..5910f364cc 100644
--- a/actionpack/test/dispatch/routing/inspector_test.rb
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -235,7 +235,7 @@ module ActionDispatch
 
         assert_equal [
           "Prefix Verb URI Pattern Controller#Action",
-          "            /foo        #{RackApp.name} {:constraint=>( my custom constraint )}"
+          "   foo      /foo        #{RackApp.name} {:constraint=>( my custom constraint )}"
         ], output
       end
 
-- 
cgit v1.2.3