Fix static analysis in utf8 helper methods

This commit is contained in:
Grzegorz Bizon 2018-11-23 10:03:43 +01:00
parent 777b6713bb
commit d1311119fa
3 changed files with 6 additions and 6 deletions

View File

@ -19,7 +19,7 @@ module Gitlab
def ensure_utf8_size(str, bytes:)
raise ArgumentError if str.empty? || bytes.negative?
truncated = str.each_char.each_with_object(String.new) do |char, object|
truncated = str.each_char.each_with_object(+'') do |char, object|
if object.bytesize + char.bytesize > bytes
break object
else

View File

@ -24,7 +24,7 @@ describe Settings do
it 'expands db key base secret to 12 bytes' do
expect(described_class.attr_encrypted_db_key_base_12)
.to eq ('a' * 10) + ("\0" * 2)
.to eq(('a' * 10) + ("\0" * 2))
end
end
@ -38,7 +38,7 @@ describe Settings do
it 'does not use more than 32 bytes' do
db_key_base = described_class.attr_encrypted_db_key_base_12
expect(db_key_base).to eq ('❤' * 4)
expect(db_key_base).to eq('❤' * 4)
expect(db_key_base.bytesize).to eq 12
end
end
@ -99,7 +99,7 @@ describe Settings do
it 'does not use more than 32 bytes' do
db_key_base = described_class.attr_encrypted_db_key_base_32
expect(db_key_base).to eq ('❤' * 10) + ("\0" * 2)
expect(db_key_base).to eq(('❤' * 10) + ("\0" * 2))
expect(db_key_base.bytesize).to eq 32
end
end

View File

@ -134,7 +134,7 @@ describe Gitlab::Utils do
transformed = described_class.ensure_utf8_size('a' * 10, bytes: 32)
expect(transformed.bytesize).to eq 32
expect(transformed).to eq ('a' * 10) + ("\0" * 22)
expect(transformed).to eq(('a' * 10) + ("\0" * 22))
end
end
@ -160,7 +160,7 @@ describe Gitlab::Utils do
it 'truncates string to 32 characters and backfills it if needed' do
transformed = described_class.ensure_utf8_size('❤' * 18, bytes: 32)
expect(transformed).to eq ('❤' * 10) + ("\0" * 2)
expect(transformed).to eq(('❤' * 10) + ("\0" * 2))
expect(transformed.bytesize).to eq 32
end
end