3 files changed, 19 insertions, 1 deletions
diff --git a/actionpack/test/controller/parameters/accessors_test.rb b/actionpack/test/controller/parameters/accessors_test.rb
index 97875c3cbb..a8f4d877a6 100644
--- a/actionpack/test/controller/parameters/accessors_test.rb
+++ b/actionpack/test/controller/parameters/accessors_test.rb
@@ -27,6 +27,12 @@ class ParametersAccessorsTest < ActiveSupport::TestCase
     assert_not @params[:person][:name].permitted?
   end
 
+  test "as_json returns the JSON representation of the parameters hash" do
+    assert_not @params.as_json.key? "parameters"
+    assert_not @params.as_json.key? "permitted"
+    assert @params.as_json.key? "person"
+  end
+
   test "each carries permitted status" do
     @params.permit!
     @params.each { |key, value| assert(value.permitted?) if key == "person" }
diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb
index 896bda2597..3299f2d9d0 100644
--- a/actionpack/test/controller/parameters/parameters_permit_test.rb
+++ b/actionpack/test/controller/parameters/parameters_permit_test.rb
@@ -334,7 +334,7 @@ class ParametersPermitTest < ActiveSupport::TestCase
     assert_not company.dupped
   end
 
-  test "included? returns true when the key is present" do
+  test "include? returns true when the key is present" do
     assert @params.include? :person
     assert @params.include? 'person'
     assert_not @params.include? :gorilla
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index a39fede5b9..178cd41922 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -94,6 +94,18 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
     assert_equal({"artist"=>"journey", "song"=>"faithfully"}, hash)
   end
 
+  def test_symbols_with_dashes_reversed
+    rs.draw do
+      get ':artist(/omg-:song)', :to => lambda { |env|
+        resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters
+        [200, {}, [resp]]
+      }
+    end
+
+    hash = ActiveSupport::JSON.decode get(URI('http://example.org/journey/omg-faithfully'))
+    assert_equal({"artist"=>"journey", "song"=>"faithfully"}, hash)
+  end
+
   def test_id_with_dash
     rs.draw do
       get '/journey/:id', :to => lambda { |env|