Skip to content

Commit 1387d21

Browse files
committed
add merge_mode to raw_configurations
1 parent c21b133 commit 1387d21

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class RequestConfigs < Struct.new(:data)
44
def raw_configs
55
Array(data[:raw_configs]).map do |attrs|
66
raw_config = RequestRawConfig.new(config: attrs[:config])
7-
RequestRawConfiguration.new(source: attrs[:source], raw_config: raw_config)
7+
RequestRawConfiguration.new(source: attrs[:source], merge_mode: attrs[:mode], raw_config: raw_config)
88
end
99
end
1010

lib/travis/api/v3/renderer/request_raw_configuration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Travis::API::V3
22
class Renderer::RequestRawConfiguration < ModelRenderer
3-
representation(:minimal, :config, :source)
3+
representation(:minimal, :config, :source, :merge_mode)
44
representation(:standard, *representations[:minimal])
55

66
def config

lib/travis/api/v3/services/requests/create.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class Services::Requests::Create < Service
55
private_constant :TIME_FRAME, :LIMIT
66

77
result_type :request
8-
params "request", "user", :merge_mode, :config, :message, :branch, :sha, :token
8+
params "request", "user", :merge_mode, :config, :configs, :message, :branch, :sha, :token
99

1010
def run
1111
repository = check_login_and_find(:repository)

spec/v3/services/request/preview_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
let(:configs) do
1010
{
11-
raw_configs: [source: 'travis-ci/travis-yml:.travis.yml@ref', config: 'script: true'],
11+
raw_configs: [source: 'travis-ci/travis-yml:.travis.yml@ref', config: 'script: true', mode: 'replace'],
1212
config: { script: ['true'] },
1313
matrix: [script: ['true']],
1414
messages: [type: :type, level: :info, key: :key, code: :code, args: { one: 'one' }, src: '.travis.yml', line: 1],
@@ -53,6 +53,7 @@ def parse(str)
5353
'@type': 'request_raw_configuration',
5454
'@representation': 'minimal',
5555
source: 'travis-ci/travis-yml:.travis.yml@ref',
56+
merge_mode: 'replace',
5657
config: 'script: true'
5758
],
5859
request_config: {

0 commit comments

Comments
 (0)