diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 20:46:57 +0300 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 18:32:41 +0300 |
commit | 7d4b52b27dcbe30d85d4fad27e983cee51cf6677 (patch) | |
tree | e7320b078fcb04b73ab9f9bfc50b7a9efc672239 /spec/lib/gitlab/conflict | |
parent | eacae00516ffe534f197eeca20655cbc0fdf5694 (diff) |
Enable Style/WordArray
Diffstat (limited to 'spec/lib/gitlab/conflict')
-rw-r--r-- | spec/lib/gitlab/conflict/file_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb index 3a24aff7fa9..b3e107dca72 100644 --- a/spec/lib/gitlab/conflict/file_spec.rb +++ b/spec/lib/gitlab/conflict/file_spec.rb @@ -44,7 +44,7 @@ describe Gitlab::Conflict::File, lib: true do it 'returns a file containing only the chosen parts of the resolved sections' do expect(resolved_lines.chunk { |line| line.type || 'both' }.map(&:first)) - .to eq(['both', 'new', 'both', 'old', 'both', 'new', 'both']) + .to eq(%w(both new both old both new both)) end end @@ -123,7 +123,7 @@ describe Gitlab::Conflict::File, lib: true do it 'sets conflict to true for sections with only changed lines' do conflict_file.sections.select { |section| section[:conflict] }.each do |section| section[:lines].each do |line| - expect(line.type).to be_in(['new', 'old']) + expect(line.type).to be_in(%w(new old)) end end end |