Skip to content

Commit 861dfa9

Browse files
committed
fix spec
1 parent 1387d21 commit 861dfa9

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

spec/v3/service_index_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ module Routes
7777
"accepted_params" => %w(
7878
request.merge_mode
7979
request.config
80+
request.configs
8081
request.message
8182
request.branch
8283
request.sha

spec/v3/services/request/find_spec.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
let(:one) { request.raw_configs.build(key: '123', config: 'language: ruby') }
4141
let(:two) { request.raw_configs.build(key: '234', config: 'rvm: 2.5.1') }
4242

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
4646

4747
before { get("/v3/repo/#{repo.id}/request/#{request.id}?include=request.raw_configs") }
4848

@@ -55,13 +55,15 @@
5555
'@type' => 'request_raw_configuration',
5656
'@representation' => 'standard',
5757
'config' => 'language: ruby',
58-
'source' => '.travis.yml'
58+
'source' => '.travis.yml',
59+
'merge_mode' => 'one',
5960
},
6061
{
6162
'@type' => 'request_raw_configuration',
6263
'@representation' => 'standard',
6364
'config' => 'rvm: 2.5.1',
64-
'source' => 'other.yml'
65+
'source' => 'other.yml',
66+
'merge_mode' => 'two',
6567
}
6668
]
6769
)

0 commit comments

Comments
 (0)