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/controllers/projects/merge_requests_controller_spec.rb | |
| parent | eacae00516ffe534f197eeca20655cbc0fdf5694 (diff) | |
| download | gitlab-ce-7d4b52b27dcbe30d85d4fad27e983cee51cf6677.tar.gz | |
Enable Style/WordArray
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index c059038f9f2..e6a8b9f6618 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -773,7 +773,7 @@ describe Projects::MergeRequestsController do section['lines'].each do |line| if section['conflict'] - expect(line['type']).to be_in(['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)) else if line['type'].nil? |