diff options
Diffstat (limited to 'spec/controllers/projects/merge_requests/conflicts_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests/conflicts_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb index 428ce5b5607..1fe297362bf 100644 --- a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb @@ -97,7 +97,7 @@ RSpec.describe Projects::MergeRequests::ConflictsController, feature_category: : section['lines'].each do |line| if section['conflict'] - expect(line['type']).to be_in(%w(old new)) + expect(line['type']).to be_in(%w[old new]) expect(line.values_at('old_line', 'new_line')).to contain_exactly(nil, a_kind_of(Integer)) elsif line['type'].nil? expect(line['old_line']).not_to eq(nil) |