diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-07-15 15:15:25 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-07-15 15:15:25 -0300 |
| commit | 4f21269c0aa1ea9991cf4864b40d9918ed6e8ba9 (patch) | |
| tree | 3074c97f3e8583d88fe8c3fda93efc82a6cdb7c7 /actionpack/test/controller/webservice_test.rb | |
| parent | 64c1264419f766a306eba0418c1030b87489ea67 (diff) | |
| parent | 84b861f1aae1b63525dcac99b3df2100b6739010 (diff) | |
| download | rails-4f21269c0aa1ea9991cf4864b40d9918ed6e8ba9.tar.gz rails-4f21269c0aa1ea9991cf4864b40d9918ed6e8ba9.tar.bz2 rails-4f21269c0aa1ea9991cf4864b40d9918ed6e8ba9.zip | |
Merge pull request #20868 from sikachu/params-not-inherited-from-hwia
Make AC::Parameters not inherited from Hash
Diffstat (limited to 'actionpack/test/controller/webservice_test.rb')
| -rw-r--r-- | actionpack/test/controller/webservice_test.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb index 21fa670bb6..bd81846a7d 100644 --- a/actionpack/test/controller/webservice_test.rb +++ b/actionpack/test/controller/webservice_test.rb @@ -14,7 +14,13 @@ class WebServiceTest < ActionDispatch::IntegrationTest def dump_params_keys(hash = params) hash.keys.sort.inject("") do |s, k| value = hash[k] - value = Hash === value ? "(#{dump_params_keys(value)})" : "" + + if value.is_a?(Hash) || value.is_a?(ActionController::Parameters) + value = "(#{dump_params_keys(value)})" + else + value = "" + end + s << ", " unless s.empty? s << "#{k}#{value}" end |