Merge pull request #1094 from travis-ci/sf-raw-config-merge-mode

add merge_mode to raw_configurations

Author: svenfuchs

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

@@ -4,7 +4,7 @@ class RequestConfigs < Struct.new(:data)
       def raw_configs
         Array(data[:raw_configs]).map do |attrs|
           raw_config = RequestRawConfig.new(config: attrs[:config])
-          RequestRawConfiguration.new(source: attrs[:source], raw_config: raw_config)
+          RequestRawConfiguration.new(source: attrs[:source], merge_mode: attrs[:mode], raw_config: raw_config)
         end
       end
 

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

@@ -1,6 +1,6 @@
 module Travis::API::V3
   class Renderer::RequestRawConfiguration < ModelRenderer
-    representation(:minimal, :config, :source)
+    representation(:minimal, :config, :source, :merge_mode)
     representation(:standard, *representations[:minimal])
 
     def config

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

@@ -5,7 +5,7 @@ class Services::Requests::Create < Service
     private_constant :TIME_FRAME, :LIMIT
 
     result_type :request
-    params "request", "user", :merge_mode, :config, :message, :branch, :sha, :token
+    params "request", "user", :merge_mode, :config, :configs, :message, :branch, :sha, :token
 
     def run
       repository = check_login_and_find(:repository)

spec/v3/service_index_spec.rb

@@ -77,6 +77,7 @@ module Routes
               "accepted_params" => %w(
                 request.merge_mode
                 request.config
+                request.configs
                 request.message
                 request.branch
                 request.sha

spec/v3/services/request/find_spec.rb

@@ -40,9 +40,9 @@
     let(:one) { request.raw_configs.build(key: '123', config: 'language: ruby') }
     let(:two) { request.raw_configs.build(key: '234', config: 'rvm: 2.5.1') }
 
-    before { request.raw_configurations.create!(raw_config: one, source: '.travis.yml') }
-    before { request.raw_configurations.create!(raw_config: two, source: 'other.yml') }
-    before { request.raw_configurations.create!(raw_config: one, source: '.travis.yml') } # accidental duplicate
+    before { request.raw_configurations.create!(raw_config: one, source: '.travis.yml', merge_mode: 'one') }
+    before { request.raw_configurations.create!(raw_config: two, source: 'other.yml', merge_mode: 'two') }
+    before { request.raw_configurations.create!(raw_config: one, source: '.travis.yml', merge_mode: 'one') } # accidental duplicate
 
     before { get("/v3/repo/#{repo.id}/request/#{request.id}?include=request.raw_configs") }
 
@@ -55,13 +55,15 @@
             '@type' => 'request_raw_configuration',
             '@representation' => 'standard',
             'config' => 'language: ruby',
-            'source' => '.travis.yml'
+            'source' => '.travis.yml',
+            'merge_mode' => 'one',
           },
           {
             '@type' => 'request_raw_configuration',
             '@representation' => 'standard',
             'config' => 'rvm: 2.5.1',
-            'source' => 'other.yml'
+            'source' => 'other.yml',
+            'merge_mode' => 'two',
           }
         ]
       )

spec/v3/services/request/preview_spec.rb

@@ -8,7 +8,7 @@
 
   let(:configs) do
     {
-      raw_configs: [source: 'travis-ci/travis-yml:.travis.yml@ref', config: 'script: true'],
+      raw_configs: [source: 'travis-ci/travis-yml:.travis.yml@ref', config: 'script: true', mode: 'replace'],
       config: { script: ['true'] },
       matrix: [script: ['true']],
       messages: [type: :type, level: :info, key: :key, code: :code, args: { one: 'one' }, src: '.travis.yml', line: 1],
@@ -53,6 +53,7 @@ def parse(str)
           '@type': 'request_raw_configuration',
           '@representation': 'minimal',
           source: 'travis-ci/travis-yml:.travis.yml@ref',
+          merge_mode: 'replace',
           config: 'script: true'
         ],
         request_config: {