root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Use force_encoding when regex contains UTF-8 char

This commit is contained in:
Shinya Maeda 2017-05-17 15:05:18 +09:00
parent b9950c22b3
commit a6f6056c62
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gitlab/ci/trace/stream.rb
View File

@ -74,7 +74,7 @@ module Gitlab
match = "" match = ""
reverse_line do |line| reverse_line do |line|
matches = line.scan(regex) matches = line.force_encoding(Encoding.default_external).scan(regex)
next unless matches.is_a?(Array) next unless matches.is_a?(Array)
next if matches.empty? next if matches.empty?

6
spec/lib/gitlab/ci/trace/stream_spec.rb
View File

@ -266,14 +266,14 @@ describe Gitlab::Ci::Trace::Stream do
end end
context 'when regex is multi-byte char' do context 'when regex is multi-byte char' do
let(:data) { 'ゴッドファット\n' } let(:data) { '95.0 ゴッドファット\n' }
let(:regex) { 'ゴッドファット' } let(:regex) { '\d+\.\d+ ゴッドファット' }
before do before do
stub_const('Gitlab::Ci::Trace::Stream::BUFFER_SIZE', 5) stub_const('Gitlab::Ci::Trace::Stream::BUFFER_SIZE', 5)
end end
it { is_expected.to be_nil } it { is_expected.to eq('95.0') }
end end
context 'when BUFFER_SIZE is equal to stream.size' do context 'when BUFFER_SIZE is equal to stream.size' do