Fixes URL generation with trailing_slash: true

URL generation with trailing_slash: true was adding a trailing slash
after .:format

    Routes.draw do
      resources :bars
    end

    bars_url(trailing_slash: true, format: 'json')
      # => /bars.json/

This commit removes that extra trailing slash

1 files changed, 18 insertions, 0 deletions

diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
index fdea27e2d2..445eb50b68 100644
--- a/actionpack/test/dispatch/url_generation_test.rb
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -15,6 +15,8 @@ module TestUrlGeneration
     Routes.draw do
       get "/foo", :to => "my_route_generating#index", :as => :foo
 
+      resources :bars
+
       mount MyRouteGeneratingController.action(:index), at: '/bar'
     end
 
@@ -97,6 +99,22 @@ module TestUrlGeneration
     test "omit subdomain when key is blank" do
       assert_equal "http://example.com/foo", foo_url(subdomain: "")
     end
+
+    test "generating URLs with trailing slashes" do
+      assert_equal "/bars.json", bars_path(
+        trailing_slash: true,
+        format: 'json'
+      )
+    end
+
+    test "generating URLS with querystring and trailing slashes" do
+      assert_equal "/bars.json?a=b", bars_path(
+        trailing_slash: true,
+        a: 'b',
+        format: 'json'
+      )
+    end
+
   end
 end