diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-08-09 23:53:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 23:53:54 +0200 |
| commit | 7b31b06d4afd73734ac54cbbac105f0eab8d0d43 (patch) | |
| tree | 94789c1c7f3c8e1c611a30548cd90ecbb34f98ea /actionpack/test/controller/parameters/always_permitted_parameters_test.rb | |
| parent | 67d0c9ee93100dbdcafd20b0632e5bef6735888e (diff) | |
| parent | f006de5dc5a709f5dc8604ebd43f7741da30cd9f (diff) | |
| download | rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.gz rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.bz2 rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.zip | |
Merge pull request #26095 from kamipo/fix_broken_alignment_by_auto_correct
Fix broken alignments caused by auto-correct commit 411ccbd
Diffstat (limited to 'actionpack/test/controller/parameters/always_permitted_parameters_test.rb')
| -rw-r--r-- | actionpack/test/controller/parameters/always_permitted_parameters_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/controller/parameters/always_permitted_parameters_test.rb b/actionpack/test/controller/parameters/always_permitted_parameters_test.rb index 9c9749c037..cd7c98f112 100644 --- a/actionpack/test/controller/parameters/always_permitted_parameters_test.rb +++ b/actionpack/test/controller/parameters/always_permitted_parameters_test.rb @@ -19,7 +19,8 @@ class AlwaysPermittedParametersTest < ActiveSupport::TestCase end test "permits parameters that are whitelisted" do - params = ActionController::Parameters.new( book: { pages: 65 }, + params = ActionController::Parameters.new( + book: { pages: 65 }, format: "json") permitted = params.permit book: [:pages] assert permitted.permitted? |