suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't overwrite settings with defaults

Browse Source 
Also changes the way the JSON fields are set to force ActiveRecord
to recognise the changes. Is there a better way?
This commit is contained in:
Joe Corcoran 2016-06-08 17:13:05 +02:00
parent fba9a87c39
commit daf534edb7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/travis/api/v3/models/settings.rb
View File

@ -11,8 +11,10 @@ module Travis::API::V3
end end
def update(settings = {}) def update(settings = {})
settings = defaults.merge(settings) settings = to_h.merge(settings)
repository.update_attributes(settings: JSON.generate(settings)) repository.settings.clear
settings.each { |k, v| repository.settings[k] = v }
repository.save!
end end
private private

3
spec/v3/services/settings_spec.rb
View File

@ -107,6 +107,7 @@ describe Travis::API::V3::Services::Settings do
let(:params) { JSON.dump('settings.build_pushes' => false) } let(:params) { JSON.dump('settings.build_pushes' => false) }
before do before do
repo.update_attributes(settings: JSON.dump('maximum_number_of_builds' => 20))
patch("/v3/repo/#{repo.id}/settings", params, json_headers.merge(auth_headers)) patch("/v3/repo/#{repo.id}/settings", params, json_headers.merge(auth_headers))
end end
@ -118,7 +119,7 @@ describe Travis::API::V3::Services::Settings do
'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' => 20
} }
) )
end end