|
40 | 40 | let(:one) { request.raw_configs.build(key: '123', config: 'language: ruby') }
|
41 | 41 | let(:two) { request.raw_configs.build(key: '234', config: 'rvm: 2.5.1') }
|
42 | 42 |
|
43 |
| - before { request.raw_configurations.create!(raw_config: one, source: '.travis.yml') } |
44 |
| - before { request.raw_configurations.create!(raw_config: two, source: 'other.yml') } |
45 |
| - before { request.raw_configurations.create!(raw_config: one, source: '.travis.yml') } # accidental duplicate |
| 43 | + before { request.raw_configurations.create!(raw_config: one, source: '.travis.yml', merge_mode: 'one') } |
| 44 | + before { request.raw_configurations.create!(raw_config: two, source: 'other.yml', merge_mode: 'two') } |
| 45 | + before { request.raw_configurations.create!(raw_config: one, source: '.travis.yml', merge_mode: 'one') } # accidental duplicate |
46 | 46 |
|
47 | 47 | before { get("/v3/repo/#{repo.id}/request/#{request.id}?include=request.raw_configs") }
|
48 | 48 |
|
|
55 | 55 | '@type' => 'request_raw_configuration',
|
56 | 56 | '@representation' => 'standard',
|
57 | 57 | 'config' => 'language: ruby',
|
58 |
| - 'source' => '.travis.yml' |
| 58 | + 'source' => '.travis.yml', |
| 59 | + 'merge_mode' => 'one', |
59 | 60 | },
|
60 | 61 | {
|
61 | 62 | '@type' => 'request_raw_configuration',
|
62 | 63 | '@representation' => 'standard',
|
63 | 64 | 'config' => 'rvm: 2.5.1',
|
64 |
| - 'source' => 'other.yml' |
| 65 | + 'source' => 'other.yml', |
| 66 | + 'merge_mode' => 'two', |
65 | 67 | }
|
66 | 68 | ]
|
67 | 69 | )
|
|
0 commit comments