Fixes unhandled case in json builder.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4463 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-12-04 10:41:31 +00:00
parent 37ed02553a
commit 558a951ed6
2 changed files with 12 additions and 1 deletions

View File

@ -56,7 +56,11 @@ module Redmine
if @struct.last.is_a?(Array)
@struct.last << ret
else
@struct.last[sym] = ret
if @struct.last.has_key?(sym) && @struct.last[sym].is_a?(Hash)
@struct.last[sym].merge! ret
else
@struct.last[sym] = ret
end
end
end
end

View File

@ -35,6 +35,13 @@ class Redmine::Views::Builders::JsonTest < HelperTestCase
b.birth :city => 'London', :country => 'UK'
end
end
assert_json_output({'person' => {'id' => 1, 'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b|
b.person :id => 1 do
b.name 'Ryan'
b.birth :city => 'London', :country => 'UK'
end
end
end
def test_array