1 files changed, 87 insertions, 82 deletions

diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
index ab56d80de3..2ef2be65d2 100644
--- a/actionview/test/template/url_helper_test.rb
+++ b/actionview/test/template/url_helper_test.rb
@@ -1,7 +1,6 @@
-require 'abstract_unit'
+require "abstract_unit"
 
 class UrlHelperTest < ActiveSupport::TestCase
-
   # In a few cases, the helper proxies to 'controller'
   # or request.
   #
@@ -43,59 +42,59 @@ class UrlHelperTest < ActiveSupport::TestCase
   end
 
   def test_url_for_with_back
-    referer = 'http://www.example.com/referer'
+    referer = "http://www.example.com/referer"
     @controller = Struct.new(:request).new(Struct.new(:env).new("HTTP_REFERER" => referer))
 
-    assert_equal 'http://www.example.com/referer', url_for(:back)
+    assert_equal "http://www.example.com/referer", url_for(:back)
   end
 
   def test_url_for_with_back_and_no_referer
     @controller = Struct.new(:request).new(Struct.new(:env).new({}))
-    assert_equal 'javascript:history.back()', url_for(:back)
+    assert_equal "javascript:history.back()", url_for(:back)
   end
 
   def test_url_for_with_back_and_no_controller
     @controller = nil
-    assert_equal 'javascript:history.back()', url_for(:back)
+    assert_equal "javascript:history.back()", url_for(:back)
   end
 
   def test_url_for_with_back_and_javascript_referer
-    referer = 'javascript:alert(document.cookie)'
+    referer = "javascript:alert(document.cookie)"
     @controller = Struct.new(:request).new(Struct.new(:env).new("HTTP_REFERER" => referer))
-    assert_equal 'javascript:history.back()', url_for(:back)
+    assert_equal "javascript:history.back()", url_for(:back)
   end
 
   def test_url_for_with_invalid_referer
-    referer = 'THIS IS NOT A URL'
+    referer = "THIS IS NOT A URL"
     @controller = Struct.new(:request).new(Struct.new(:env).new("HTTP_REFERER" => referer))
-    assert_equal 'javascript:history.back()', url_for(:back)
+    assert_equal "javascript:history.back()", url_for(:back)
   end
 
   def test_to_form_params_with_hash
     assert_equal(
-      [{ name: :name, value: 'David' }, { name: :nationality, value: 'Danish' }],
-      to_form_params(name: 'David', nationality: 'Danish')
+      [{ name: :name, value: "David" }, { name: :nationality, value: "Danish" }],
+      to_form_params(name: "David", nationality: "Danish")
     )
   end
 
   def test_to_form_params_with_nested_hash
     assert_equal(
-      [{ name: 'country[name]', value: 'Denmark' }],
-      to_form_params(country: { name: 'Denmark' })
+      [{ name: "country[name]", value: "Denmark" }],
+      to_form_params(country: { name: "Denmark" })
     )
   end
 
   def test_to_form_params_with_array_nested_in_hash
     assert_equal(
-      [{ name: 'countries[]', value: 'Denmark' }, { name: 'countries[]', value: 'Sweden' }],
-      to_form_params(countries: ['Denmark', 'Sweden'])
+      [{ name: "countries[]", value: "Denmark" }, { name: "countries[]", value: "Sweden" }],
+      to_form_params(countries: ["Denmark", "Sweden"])
     )
   end
 
   def test_to_form_params_with_namespace
     assert_equal(
-      [{ name: 'country[name]', value: 'Denmark' }],
-      to_form_params({name: 'Denmark'}, 'country')
+      [{ name: "country[name]", value: "Denmark" }],
+      to_form_params({ name: "Denmark" }, "country")
     )
   end
 
@@ -122,11 +121,11 @@ class UrlHelperTest < ActiveSupport::TestCase
   end
 
   def test_button_to_with_form_class
-    assert_dom_equal %{<form method="post" action="http://www.example.com" class="custom-class"><input type="submit" value="Hello" /></form>}, button_to("Hello", "http://www.example.com", form_class: 'custom-class')
+    assert_dom_equal %{<form method="post" action="http://www.example.com" class="custom-class"><input type="submit" value="Hello" /></form>}, button_to("Hello", "http://www.example.com", form_class: "custom-class")
   end
 
   def test_button_to_with_form_class_escapes
-    assert_dom_equal %{<form method="post" action="http://www.example.com" class="&lt;script&gt;evil_js&lt;/script&gt;"><input type="submit" value="Hello" /></form>}, button_to("Hello", "http://www.example.com", form_class: '<script>evil_js</script>')
+    assert_dom_equal %{<form method="post" action="http://www.example.com" class="&lt;script&gt;evil_js&lt;/script&gt;"><input type="submit" value="Hello" /></form>}, button_to("Hello", "http://www.example.com", form_class: "<script>evil_js</script>")
   end
 
   def test_button_to_with_query
@@ -211,7 +210,7 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_button_to_with_block
     assert_dom_equal(
       %{<form method="post" action="http://www.example.com" class="button_to"><button type="submit"><span>Hello</span></button></form>},
-      button_to("http://www.example.com") { content_tag(:span, 'Hello') }
+      button_to("http://www.example.com") { content_tag(:span, "Hello") }
     )
   end
 
@@ -225,14 +224,14 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_button_to_with_nested_hash_params
     assert_dom_equal(
       %{<form action="http://www.example.com" class="button_to" method="post"><input type="submit" value="Hello" /><input type="hidden" name="foo[bar]" value="baz" /></form>},
-      button_to("Hello", "http://www.example.com", params: { foo: { bar: 'baz' } })
+      button_to("Hello", "http://www.example.com", params: { foo: { bar: "baz" } })
     )
   end
 
   def test_button_to_with_nested_array_params
     assert_dom_equal(
       %{<form action="http://www.example.com" class="button_to" method="post"><input type="submit" value="Hello" /><input type="hidden" name="foo[]" value="bar" /></form>},
-      button_to("Hello", "http://www.example.com", params: { foo: ['bar'] })
+      button_to("Hello", "http://www.example.com", params: { foo: ["bar"] })
     )
   end
 
@@ -241,13 +240,13 @@ class UrlHelperTest < ActiveSupport::TestCase
   end
 
   def test_link_tag_without_host_option
-    assert_dom_equal(%{<a href="/">Test Link</a>}, link_to('Test Link', url_hash))
+    assert_dom_equal(%{<a href="/">Test Link</a>}, link_to("Test Link", url_hash))
   end
 
   def test_link_tag_with_host_option
     hash = hash_for(host: "www.example.com")
     expected = %{<a href="http://www.example.com/">Test Link</a>}
-    assert_dom_equal(expected, link_to('Test Link', hash))
+    assert_dom_equal(expected, link_to("Test Link", hash))
   end
 
   def test_link_tag_with_query
@@ -261,15 +260,15 @@ class UrlHelperTest < ActiveSupport::TestCase
   end
 
   def test_link_tag_with_back
-    env = {"HTTP_REFERER" => "http://www.example.com/referer"}
+    env = { "HTTP_REFERER" => "http://www.example.com/referer" }
     @controller = Struct.new(:request).new(Struct.new(:env).new(env))
     expected = %{<a href="#{env["HTTP_REFERER"]}">go back</a>}
-    assert_dom_equal expected, link_to('go back', :back)
+    assert_dom_equal expected, link_to("go back", :back)
   end
 
   def test_link_tag_with_back_and_no_referer
     @controller = Struct.new(:request).new(Struct.new(:env).new({}))
-    link = link_to('go back', :back)
+    link = link_to("go back", :back)
     assert_dom_equal %{<a href="javascript:history.back()">go back</a>}, link
   end
 
@@ -329,7 +328,7 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_link_to_with_string_remote_in_non_html_options
     assert_dom_equal(
       %{<a href="/" data-remote="true">Hello</a>},
-      link_to("Hello", hash_for('remote' => true), {})
+      link_to("Hello", hash_for("remote" => true), {})
     )
   end
 
@@ -350,14 +349,14 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_link_tag_using_delete_javascript_and_href
     assert_dom_equal(
       %{<a href="\#" rel="nofollow" data-method="delete">Destroy</a>},
-      link_to("Destroy", "http://www.example.com", method: :delete, href: '#')
+      link_to("Destroy", "http://www.example.com", method: :delete, href: "#")
     )
   end
 
   def test_link_tag_using_post_javascript_and_rel
     assert_dom_equal(
       %{<a href="http://www.example.com" data-method="post" rel="example nofollow">Hello</a>},
-      link_to("Hello", "http://www.example.com", method: :post, rel: 'example')
+      link_to("Hello", "http://www.example.com", method: :post, rel: "example")
     )
   end
 
@@ -371,24 +370,24 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_link_tag_using_delete_javascript_and_href_and_confirm
     assert_dom_equal(
       %{<a href="\#" rel="nofollow" data-confirm="Are you serious?" data-method="delete">Destroy</a>},
-      link_to("Destroy", "http://www.example.com", method: :delete, href: '#', data: { confirm: "Are you serious?" })
+      link_to("Destroy", "http://www.example.com", method: :delete, href: "#", data: { confirm: "Are you serious?" })
     )
   end
 
   def test_link_tag_with_block
     assert_dom_equal %{<a href="/"><span>Example site</span></a>},
-      link_to('/') { content_tag(:span, 'Example site') }
+      link_to("/") { content_tag(:span, "Example site") }
   end
 
   def test_link_tag_with_block_and_html_options
     assert_dom_equal %{<a class="special" href="/"><span>Example site</span></a>},
-      link_to('/', class: "special") { content_tag(:span, 'Example site') }
+      link_to("/", class: "special") { content_tag(:span, "Example site") }
   end
 
   def test_link_tag_using_block_and_hash
     assert_dom_equal(
       %{<a href="/"><span>Example site</span></a>},
-      link_to(url_hash) { content_tag(:span, 'Example site') }
+      link_to(url_hash) { content_tag(:span, "Example site") }
     )
   end
 
@@ -452,7 +451,7 @@ class UrlHelperTest < ActiveSupport::TestCase
   end
 
   def test_current_page_with_http_head_method
-    @request = request_for_url("/", :method => :head)
+    @request = request_for_url("/", method: :head)
     assert current_page?(url_hash)
     assert current_page?("http://www.example.com/")
   end
@@ -480,19 +479,19 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_current_page_with_not_get_verb
     @request = request_for_url("/events", method: :post)
 
-    assert !current_page?('/events')
+    assert !current_page?("/events")
   end
 
   def test_current_page_with_escaped_params
     @request = request_for_url("/category/administra%c3%a7%c3%a3o")
 
-    assert current_page?(controller: 'foo', action: 'category', category: 'administração')
+    assert current_page?(controller: "foo", action: "category", category: "administração")
   end
 
   def test_current_page_with_escaped_params_with_different_encoding
     @request = request_for_url("/")
     @request.stub(:path, "/category/administra%c3%a7%c3%a3o".force_encoding(Encoding::ASCII_8BIT)) do
-      assert current_page?(:controller => 'foo', :action => 'category', category: 'administração')
+      assert current_page?(controller: "foo", action: "category", category: "administração")
       assert current_page?("http://www.example.com/category/administra%c3%a7%c3%a3o")
     end
   end
@@ -500,7 +499,13 @@ class UrlHelperTest < ActiveSupport::TestCase
   def test_current_page_with_double_escaped_params
     @request = request_for_url("/category/administra%c3%a7%c3%a3o?callback_url=http%3a%2f%2fexample.com%2ffoo")
 
-    assert current_page?(controller: 'foo', action: 'category', category: 'administração', callback_url: 'http://example.com/foo')
+    assert current_page?(controller: "foo", action: "category", category: "administração", callback_url: "http://example.com/foo")
+  end
+
+  def test_current_page_with_trailing_slash
+    @request = request_for_url("/posts")
+
+    assert current_page?("/posts/")
   end
 
   def test_link_unless_current
@@ -521,7 +526,7 @@ class UrlHelperTest < ActiveSupport::TestCase
     @request = request_for_url("/?order=desc&page=1")
 
     assert_equal "Showing",
-      link_to_unless_current("Showing", hash_for(order: 'desc', page: '1'))
+      link_to_unless_current("Showing", hash_for(order: "desc", page: "1"))
     assert_equal "Showing",
       link_to_unless_current("Showing", "http://www.example.com/?order=desc&page=1")
 
@@ -577,13 +582,13 @@ class UrlHelperTest < ActiveSupport::TestCase
 
     assert_dom_equal(
       %{<a href="mailto:me@example.com?body=This%20is%20the%20body%20of%20the%20message.&amp;subject=This%20is%20an%20example%20email">My email</a>},
-      mail_to("me@example.com", "My email", cc: '', bcc: '', subject: "This is an example email", body: "This is the body of the message.")
+      mail_to("me@example.com", "My email", cc: "", bcc: "", subject: "This is an example email", body: "This is the body of the message.")
     )
   end
 
   def test_mail_to_with_img
     assert_dom_equal %{<a href="mailto:feedback@example.com"><img src="/feedback.png" /></a>},
-      mail_to('feedback@example.com', raw('<img src="/feedback.png" />'))
+      mail_to("feedback@example.com", raw('<img src="/feedback.png" />'))
   end
 
   def test_mail_to_with_html_safe_string
@@ -606,22 +611,22 @@ class UrlHelperTest < ActiveSupport::TestCase
 
   def test_mail_to_with_block
     assert_dom_equal %{<a href="mailto:me@example.com"><span>Email me</span></a>},
-      mail_to('me@example.com') { content_tag(:span, 'Email me') }
+      mail_to("me@example.com") { content_tag(:span, "Email me") }
   end
 
   def test_mail_to_with_block_and_options
     assert_dom_equal %{<a class="special" href="mailto:me@example.com?cc=ccaddress%40example.com"><span>Email me</span></a>},
-      mail_to('me@example.com', cc: "ccaddress@example.com", class: "special") { content_tag(:span, 'Email me') }
+      mail_to("me@example.com", cc: "ccaddress@example.com", class: "special") { content_tag(:span, "Email me") }
   end
 
   def test_mail_to_does_not_modify_html_options_hash
-    options = { class: 'special' }
-    mail_to 'me@example.com', 'ME!', options
-    assert_equal({ class: 'special' }, options)
+    options = { class: "special" }
+    mail_to "me@example.com", "ME!", options
+    assert_equal({ class: "special" }, options)
   end
 
   def protect_against_forgery?
-    self.request_forgery
+    request_forgery
   end
 
   def form_authenticity_token(*args)
@@ -634,8 +639,8 @@ class UrlHelperTest < ActiveSupport::TestCase
 
   private
     def sort_query_string_params(uri)
-      path, qs = uri.split('?')
-      qs = qs.split('&amp;').sort.join('&amp;') if qs
+      path, qs = uri.split("?")
+      qs = qs.split("&amp;").sort.join("&amp;") if qs
       qs ? "#{path}?#{qs}" : path
     end
 end
@@ -643,34 +648,34 @@ end
 class UrlHelperControllerTest < ActionController::TestCase
   class UrlHelperController < ActionController::Base
     test_routes do
-      get 'url_helper_controller_test/url_helper/show/:id',
-        to: 'url_helper_controller_test/url_helper#show',
+      get "url_helper_controller_test/url_helper/show/:id",
+        to: "url_helper_controller_test/url_helper#show",
         as: :show
 
-      get 'url_helper_controller_test/url_helper/profile/:name',
-        to: 'url_helper_controller_test/url_helper#show',
+      get "url_helper_controller_test/url_helper/profile/:name",
+        to: "url_helper_controller_test/url_helper#show",
         as: :profile
 
-      get 'url_helper_controller_test/url_helper/show_named_route',
-        to: 'url_helper_controller_test/url_helper#show_named_route',
+      get "url_helper_controller_test/url_helper/show_named_route",
+        to: "url_helper_controller_test/url_helper#show_named_route",
         as: :show_named_route
 
       ActiveSupport::Deprecation.silence do
         get "/:controller(/:action(/:id))"
       end
 
-      get 'url_helper_controller_test/url_helper/normalize_recall_params',
+      get "url_helper_controller_test/url_helper/normalize_recall_params",
         to: UrlHelperController.action(:normalize_recall),
         as: :normalize_recall_params
 
-      get '/url_helper_controller_test/url_helper/override_url_helper/default',
-        to: 'url_helper_controller_test/url_helper#override_url_helper',
+      get "/url_helper_controller_test/url_helper/override_url_helper/default",
+        to: "url_helper_controller_test/url_helper#override_url_helper",
         as: :override_url_helper
     end
 
     def show
       if params[:name]
-        render inline: 'ok'
+        render inline: "ok"
       else
         redirect_to profile_path(params[:id])
       end
@@ -685,23 +690,23 @@ class UrlHelperControllerTest < ActionController::TestCase
     end
 
     def nil_url_for
-      render inline: '<%= url_for(nil) %>'
+      render inline: "<%= url_for(nil) %>"
     end
 
     def normalize_recall_params
-      render inline: '<%= normalize_recall_params_path %>'
+      render inline: "<%= normalize_recall_params_path %>"
     end
 
     def recall_params_not_changed
-      render inline: '<%= url_for(action: :show_url_for) %>'
+      render inline: "<%= url_for(action: :show_url_for) %>"
     end
 
     def override_url_helper
-      render inline: '<%= override_url_helper_path %>'
+      render inline: "<%= override_url_helper_path %>"
     end
 
     def override_url_helper_path
-      '/url_helper_controller_test/url_helper/override_url_helper/override'
+      "/url_helper_controller_test/url_helper/override_url_helper/override"
     end
     helper_method :override_url_helper_path
   end
@@ -710,58 +715,58 @@ class UrlHelperControllerTest < ActionController::TestCase
 
   def test_url_for_shows_only_path
     get :show_url_for
-    assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
+    assert_equal "/url_helper_controller_test/url_helper/show_url_for", @response.body
   end
 
   def test_named_route_url_shows_host_and_path
-    get :show_named_route, params: { kind: 'url' }
-    assert_equal 'http://test.host/url_helper_controller_test/url_helper/show_named_route',
+    get :show_named_route, params: { kind: "url" }
+    assert_equal "http://test.host/url_helper_controller_test/url_helper/show_named_route",
       @response.body
   end
 
   def test_named_route_path_shows_only_path
-    get :show_named_route, params: { kind: 'path' }
-    assert_equal '/url_helper_controller_test/url_helper/show_named_route', @response.body
+    get :show_named_route, params: { kind: "path" }
+    assert_equal "/url_helper_controller_test/url_helper/show_named_route", @response.body
   end
 
   def test_url_for_nil_returns_current_path
     get :nil_url_for
-    assert_equal '/url_helper_controller_test/url_helper/nil_url_for', @response.body
+    assert_equal "/url_helper_controller_test/url_helper/nil_url_for", @response.body
   end
 
   def test_named_route_should_show_host_and_path_using_controller_default_url_options
     class << @controller
       def default_url_options
-        { host: 'testtwo.host' }
+        { host: "testtwo.host" }
       end
     end
 
-    get :show_named_route, params: { kind: 'url' }
-    assert_equal 'http://testtwo.host/url_helper_controller_test/url_helper/show_named_route', @response.body
+    get :show_named_route, params: { kind: "url" }
+    assert_equal "http://testtwo.host/url_helper_controller_test/url_helper/show_named_route", @response.body
   end
 
   def test_recall_params_should_be_normalized
     get :normalize_recall_params
-    assert_equal '/url_helper_controller_test/url_helper/normalize_recall_params', @response.body
+    assert_equal "/url_helper_controller_test/url_helper/normalize_recall_params", @response.body
   end
 
   def test_recall_params_should_not_be_changed
     get :recall_params_not_changed
-    assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
+    assert_equal "/url_helper_controller_test/url_helper/show_url_for", @response.body
   end
 
   def test_recall_params_should_normalize_id
-    get :show, params: { id: '123' }
+    get :show, params: { id: "123" }
     assert_equal 302, @response.status
-    assert_equal 'http://test.host/url_helper_controller_test/url_helper/profile/123', @response.location
+    assert_equal "http://test.host/url_helper_controller_test/url_helper/profile/123", @response.location
 
-    get :show, params: { name: '123' }
-    assert_equal 'ok', @response.body
+    get :show, params: { name: "123" }
+    assert_equal "ok", @response.body
   end
 
   def test_url_helper_can_be_overridden
     get :override_url_helper
-    assert_equal '/url_helper_controller_test/url_helper/override_url_helper/override', @response.body
+    assert_equal "/url_helper_controller_test/url_helper/override_url_helper/override", @response.body
   end
 end