Move settings to top level of response

To better accommodate nested responses.
This commit is contained in:
Joe Corcoran 2016-06-08 17:18:24 +02:00
parent daf534edb7
commit eb0eab5967
2 changed files with 14 additions and 22 deletions

View File

@ -9,10 +9,8 @@ module Travis::API::V3
end end
def render(settings, **) def render(settings, **)
{ response = { '@type' => 'settings'.freeze }
:@type => 'settings'.freeze, response.merge(settings.to_h)
:settings => settings.to_h
}
end end
end end
end end

View File

@ -40,12 +40,10 @@ describe Travis::API::V3::Services::Settings do
example do example do
expect(JSON.load(body)).to eq( expect(JSON.load(body)).to eq(
'@type' => 'settings', '@type' => 'settings',
'settings' => { 'builds_only_with_travis_yml' => false,
'builds_only_with_travis_yml' => false, 'build_pushes' => true,
'build_pushes' => true, 'build_pull_requests' => true,
'build_pull_requests' => true, 'maximum_number_of_builds' => 0
'maximum_number_of_builds' => 0
}
) )
end end
end end
@ -60,12 +58,10 @@ describe Travis::API::V3::Services::Settings do
example do example do
expect(JSON.load(body)).to eq( expect(JSON.load(body)).to eq(
'@type' => 'settings', '@type' => 'settings',
'settings' => { 'builds_only_with_travis_yml' => false,
'builds_only_with_travis_yml' => false, 'build_pushes' => false,
'build_pushes' => false, 'build_pull_requests' => true,
'build_pull_requests' => true, 'maximum_number_of_builds' => 0
'maximum_number_of_builds' => 0
}
) )
end end
end end
@ -115,12 +111,10 @@ describe Travis::API::V3::Services::Settings do
example do example do
expect(JSON.load(body)).to eq( expect(JSON.load(body)).to eq(
'@type' => 'settings', '@type' => 'settings',
'settings' => { 'builds_only_with_travis_yml' => false,
'builds_only_with_travis_yml' => false, 'build_pushes' => false,
'build_pushes' => false, 'build_pull_requests' => true,
'build_pull_requests' => true, 'maximum_number_of_builds' => 20
'maximum_number_of_builds' => 20
}
) )
end end
end end