Commit 9a37ef43 authored by blackst0ne's avatar blackst0ne

[Rails5] Fix `storage_counter` helper

Since rails 5 beta 2 support of petabytes and exabytes were added to the
`number_to_human*` methods.
See https://github.com/rails/rails/pull/22759

So for rails5 the comma separator gets shown for big numbers (EBs).
parent b4f29f58
require 'spec_helper' require "spec_helper"
describe StorageHelper do describe StorageHelper do
describe '#storage_counter' do describe "#storage_counter" do
it 'formats bytes to one decimal place' do it "formats bytes to one decimal place" do
expect(helper.storage_counter(1.23.megabytes)).to eq '1.2 MB' expect(helper.storage_counter(1.23.megabytes)).to eq("1.2 MB")
end end
it 'does not add decimals for sizes < 1 MB' do it "does not add decimals for sizes < 1 MB" do
expect(helper.storage_counter(23.5.kilobytes)).to eq '24 KB' expect(helper.storage_counter(23.5.kilobytes)).to eq("24 KB")
end end
it 'does not add decimals for zeroes' do it "does not add decimals for zeroes" do
expect(helper.storage_counter(2.megabytes)).to eq '2 MB' expect(helper.storage_counter(2.megabytes)).to eq("2 MB")
end end
it 'uses commas as thousands separator' do it "uses commas as thousands separator" do
expect(helper.storage_counter(100_000_000_000_000_000)).to eq '90,949.5 TB' if Gitlab.rails5?
expect(helper.storage_counter(100_000_000_000_000_000_000_000)).to eq("86,736.2 EB")
else
expect(helper.storage_counter(100_000_000_000_000_000)).to eq("90,949.5 TB")
end
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment