diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 11:46:57 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:32:41 -0600 |
| commit | 7d4b52b27dcbe30d85d4fad27e983cee51cf6677 (patch) | |
| tree | e7320b078fcb04b73ab9f9bfc50b7a9efc672239 /spec/services/merge_requests | |
| parent | eacae00516ffe534f197eeca20655cbc0fdf5694 (diff) | |
| download | gitlab-ce-7d4b52b27dcbe30d85d4fad27e983cee51cf6677.tar.gz | |
Enable Style/WordArray
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/resolve_service_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/services/merge_requests/resolve_service_spec.rb b/spec/services/merge_requests/resolve_service_spec.rb index 71e46969265..26cf0bbffdf 100644 --- a/spec/services/merge_requests/resolve_service_spec.rb +++ b/spec/services/merge_requests/resolve_service_spec.rb @@ -59,8 +59,8 @@ describe MergeRequests::ResolveService do it 'creates a commit with the correct parents' do expect(merge_request.source_branch_head.parents.map(&:id)) - .to eq(['1450cd639e0bc6721eb02800169e464f212cde06', - '824be604a34828eb682305f0d963056cfac87b2d']) + .to eq(%w(1450cd639e0bc6721eb02800169e464f212cde06 +824be604a34828eb682305f0d963056cfac87b2d)) end end @@ -125,8 +125,8 @@ describe MergeRequests::ResolveService do it 'creates a commit with the correct parents' do expect(merge_request.source_branch_head.parents.map(&:id)) - .to eq(['1450cd639e0bc6721eb02800169e464f212cde06', - '824be604a34828eb682305f0d963056cfac87b2d']) + .to eq(%w(1450cd639e0bc6721eb02800169e464f212cde06 +824be604a34828eb682305f0d963056cfac87b2d)) end it 'sets the content to the content given' do |