Skip to content

Commit ab10c15

Browse files
committed
pass through multiple build request configs
1 parent 74b04a8 commit ab10c15

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

lib/travis/api/v3/queries/request.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Travis::API::V3
22
class Queries::Request < Query
3-
params :id, :message, :branch, :sha, :merge_mode, :config, :token, prefix: :request
3+
params :id, :message, :branch, :sha, :merge_mode, :config, :configs, :token, prefix: :request
44

55
def find
66
raise WrongParams, 'missing request.id'.freeze unless id
@@ -37,8 +37,10 @@ def schedule(repository, user)
3737
message: message,
3838
branch: branch || repository.default_branch.name,
3939
sha: sha,
40+
configs: request_configs,
41+
# BC, remove once everyone is on yml/configs, coordinate with Gatekeeper
4042
merge_mode: merge_mode,
41-
config: config
43+
config: config,
4244
}
4345

4446
::Travis::API::Sidekiq.gatekeeper(
@@ -51,6 +53,11 @@ def schedule(repository, user)
5153

5254
private
5355

56+
def request_configs
57+
return configs if configs
58+
[{ config: config, merge_mode: merge_mode }] if config
59+
end
60+
5461
def create_request(repository)
5562
Models::Request.create!(
5663
event_type: :api,

spec/v3/services/requests/create_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@
136136
branch: 'master',
137137
sha: nil,
138138
merge_mode: nil,
139-
config: nil
139+
config: nil,
140+
configs: nil
140141
}
141142
end
142143

@@ -206,7 +207,7 @@
206207

207208
describe 'overriding config' do
208209
let(:params) { { config: { script: 'true' } } }
209-
it { expect(sidekiq_payload).to eq payload.merge(config: params[:config]) }
210+
it { expect(sidekiq_payload).to eq payload.merge(config: params[:config], configs: [config: params[:config], merge_mode: nil]) }
210211
end
211212

212213
describe 'overriding message' do

0 commit comments

Comments
 (0)