diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-13 12:17:15 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-13 12:17:15 +0000 |
commit | 031ee142b1cd941eb10afd11db553173a60428f3 (patch) | |
tree | 933e184cce7c046237f2c46905d0a4391d88d767 | |
parent | 4970c8c553d7d8c054322773636ad65548d560ec (diff) | |
parent | 9a37ef438e52fd33bb592f1b5cf637ecc2bb962d (diff) | |
download | gitlab-ce-031ee142b1cd941eb10afd11db553173a60428f3.tar.gz |
Merge branch 'blackst0ne-rails5-fix-storage-counter-helper' into 'master'
Resolve "[Rails5] `StorageHelper#storage_counter uses commas as thousands separator` fails"
Closes #47375
See merge request gitlab-org/gitlab-ce!19725
-rw-r--r-- | spec/helpers/storage_helper_spec.rb | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/spec/helpers/storage_helper_spec.rb b/spec/helpers/storage_helper_spec.rb index 4627a1e1872..c580b78c908 100644 --- a/spec/helpers/storage_helper_spec.rb +++ b/spec/helpers/storage_helper_spec.rb @@ -1,21 +1,25 @@ -require 'spec_helper' +require "spec_helper" describe StorageHelper do - describe '#storage_counter' do - it 'formats bytes to one decimal place' do - expect(helper.storage_counter(1.23.megabytes)).to eq '1.2 MB' + describe "#storage_counter" do + it "formats bytes to one decimal place" do + expect(helper.storage_counter(1.23.megabytes)).to eq("1.2 MB") end - it 'does not add decimals for sizes < 1 MB' do - expect(helper.storage_counter(23.5.kilobytes)).to eq '24 KB' + it "does not add decimals for sizes < 1 MB" do + expect(helper.storage_counter(23.5.kilobytes)).to eq("24 KB") end - it 'does not add decimals for zeroes' do - expect(helper.storage_counter(2.megabytes)).to eq '2 MB' + it "does not add decimals for zeroes" do + expect(helper.storage_counter(2.megabytes)).to eq("2 MB") end - it 'uses commas as thousands separator' do - expect(helper.storage_counter(100_000_000_000_000_000)).to eq '90,949.5 TB' + it "uses commas as thousands separator" do + 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 |