fix(tests): Adjust tests for for correct file size unit

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

apps/files/src/views/Navigation.cy.ts

@@ -13,7 +13,7 @@ describe('Navigation renders', () => {
 
  before(() => {
  cy.mockInitialState('files', 'storageStats', {
- used: 1000 * 1000 * 1000,
+ used: 1024 * 1024 * 1024,
  quota: -1,
  })
  })
@@ -178,7 +178,7 @@ describe('Quota rendering', () => {
 
  it('Unlimited quota', () => {
  cy.mockInitialState('files', 'storageStats', {
- used: 1000 * 1000 * 1000,
+ used: 1024 * 1024 * 1024,
  quota: -1,
  })
 
@@ -194,14 +194,14 @@ describe('Quota rendering', () => {
  })
 
  cy.get('[data-cy-files-navigation-settings-quota]').should('be.visible')
- cy.get('[data-cy-files-navigation-settings-quota]').should('contain.text', '1 GB used')
+ cy.get('[data-cy-files-navigation-settings-quota]').should('contain.text', '1 GiB used')
  cy.get('[data-cy-files-navigation-settings-quota] progress').should('not.exist')
  })
 
  it('Non-reached quota', () => {
  cy.mockInitialState('files', 'storageStats', {
- used: 1000 * 1000 * 1000,
- quota: 5 * 1000 * 1000 * 1000,
+ used: 1024 * 1024 * 1024,
+ quota: 5 * 1024 * 1024 * 1024,
  relative: 20, // percent
  })
 
@@ -217,15 +217,15 @@ describe('Quota rendering', () => {
  })
 
  cy.get('[data-cy-files-navigation-settings-quota]').should('be.visible')
- cy.get('[data-cy-files-navigation-settings-quota]').should('contain.text', '1 GB of 5 GB used')
+ cy.get('[data-cy-files-navigation-settings-quota]').should('contain.text', '1 GiB of 5 GiB used')
  cy.get('[data-cy-files-navigation-settings-quota] progress').should('be.visible')
  cy.get('[data-cy-files-navigation-settings-quota] progress').should('have.attr', 'value', '20')
  })
 
  it('Reached quota', () => {
  cy.mockInitialState('files', 'storageStats', {
- used: 5 * 1000 * 1000 * 1000,
- quota: 1000 * 1000 * 1000,
+ used: 5 * 1024 * 1024 * 1024,
+ quota: 1024 * 1024 * 1024,
  relative: 500, // percent
  })
 
@@ -241,7 +241,7 @@ describe('Quota rendering', () => {
  })
 
  cy.get('[data-cy-files-navigation-settings-quota]').should('be.visible')
- cy.get('[data-cy-files-navigation-settings-quota]').should('contain.text', '5 GB of 1 GB used')
+ cy.get('[data-cy-files-navigation-settings-quota]').should('contain.text', '5 GiB of 1 GiB used')
  cy.get('[data-cy-files-navigation-settings-quota] progress').should('be.visible')
  cy.get('[data-cy-files-navigation-settings-quota] progress').should('have.attr', 'value', '100') // progress max is 100
  })

apps/files/tests/js/filelistSpec.js

@@ -253,7 +253,7 @@ describe('OCA.Files.FileList tests', function() {
  .toEqual(OC.getRootPath() + '/remote.php/webdav/subdir/testName.txt');
  expect($tr.find('.nametext').text().trim()).toEqual('testName.txt');
 
- expect($tr.find('.filesize').text()).toEqual('1 KB');
+ expect($tr.find('.filesize').text()).toEqual('1 KiB');
  expect($tr.find('.date').text()).not.toEqual('?');
  expect(fileList.findFileEl('testName.txt')[0]).toEqual($tr[0]);
  });
@@ -307,7 +307,7 @@ describe('OCA.Files.FileList tests', function() {
  expect($tr.attr('data-mtime')).toEqual('123456');
  expect($tr.attr('data-e2eencrypted')).toEqual('false');
 
- expect($tr.find('.filesize').text()).toEqual('1 KB');
+ expect($tr.find('.filesize').text()).toEqual('1 KiB');
  expect($tr.find('.date').text()).not.toEqual('?');
 
  expect(fileList.findFileEl('testFolder')[0]).toEqual($tr[0]);
@@ -380,7 +380,7 @@ describe('OCA.Files.FileList tests', function() {
  size: '0'
  };
  var $tr = fileList.add(fileData);
- expect($tr.find('.filesize').text()).toEqual('0 KB');
+ expect($tr.find('.filesize').text()).toEqual('0 KiB');
  });
  it('generates file element with unknown date when mtime invalid', function() {
  var fileData = {
@@ -539,7 +539,7 @@ describe('OCA.Files.FileList tests', function() {
  expect($summary.find('.fileinfo').text()).toEqual('2 files');
  expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(false);
  expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
- expect($summary.find('.filesize').text()).toEqual('70 KB');
+ expect($summary.find('.filesize').text()).toEqual('69 KiB');
  expect(fileList.isEmpty).toEqual(false);
  });
  it('Shows empty content when removing last file', function() {
@@ -609,7 +609,7 @@ describe('OCA.Files.FileList tests', function() {
  expect($summary.find('.fileinfo').text()).toEqual('1 file');
  expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(false);
  expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
- expect($summary.find('.filesize').text()).toEqual('58 KB');
+ expect($summary.find('.filesize').text()).toEqual('57 KiB');
  expect(fileList.isEmpty).toEqual(false);
  expect($('.files-filestable thead th').hasClass('hidden')).toEqual(false);
  expect($('.emptyfilelist.emptycontent').hasClass('hidden')).toEqual(true);
@@ -959,7 +959,7 @@ describe('OCA.Files.FileList tests', function() {
 
  // folder size has increased
  expect(fileList.findFileEl('somedir').data('size')).toEqual(12311);
- expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('12 KB');
+ expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('12 KiB');
 
  expect(notificationStub.notCalled).toEqual(true);
  }).then(done, done);
@@ -1062,7 +1062,7 @@ describe('OCA.Files.FileList tests', function() {
 
  // folder size has increased
  expect(fileList.findFileEl('somedir').data('size')).toEqual(12311);
- expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('12 KB');
+ expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('12 KiB');
 
  expect(notificationStub.notCalled).toEqual(false);
  }).then(done, done);
@@ -1138,7 +1138,7 @@ describe('OCA.Files.FileList tests', function() {
  expect($summary.hasClass('hidden')).toEqual(false);
  expect($summary.find('.dirinfo').text()).toEqual('1 folder');
  expect($summary.find('.fileinfo').text()).toEqual('3 files');
- expect($summary.find('.filesize').text()).toEqual('70 KB');
+ expect($summary.find('.filesize').text()).toEqual('69 KiB');
  });
  it('shows headers, summary and hide empty content message after setting files', function(){
  fileList.setFiles(testFiles);

apps/files/tests/js/filesummarySpec.js

@@ -39,12 +39,12 @@ describe('OCA.Files.FileSummary tests', function() {
  s.setSummary({
  totalDirs: 5,
  totalFiles: 2,
- totalSize: 256000
+ totalSize: 256*1024,
  });
  expect($container.hasClass('hidden')).toEqual(false);
  expect($container.find('.dirinfo').text()).toEqual('5 folders');
  expect($container.find('.fileinfo').text()).toEqual('2 files');
- expect($container.find('.filesize').text()).toEqual('256 KB');
+ expect($container.find('.filesize').text()).toEqual('256 KiB');
  });
  it('hides summary when no files or folders', function() {
  var s = new FileSummary($container);
@@ -60,51 +60,51 @@ describe('OCA.Files.FileSummary tests', function() {
  s.setSummary({
  totalDirs: 5,
  totalFiles: 2,
- totalSize: 256000
+ totalSize: 256*1024
  });
- s.add({type: 'file', size: 256000});
+ s.add({type: 'file', size: 256*1024});
  s.add({type: 'dir', size: 100});
  s.update();
  expect($container.hasClass('hidden')).toEqual(false);
  expect($container.find('.dirinfo').text()).toEqual('6 folders');
  expect($container.find('.fileinfo').text()).toEqual('3 files');
- expect($container.find('.filesize').text()).toEqual('512 KB');
+ expect($container.find('.filesize').text()).toEqual('512 KiB');
  expect(s.summary.totalDirs).toEqual(6);
  expect(s.summary.totalFiles).toEqual(3);
- expect(s.summary.totalSize).toEqual(512100);
+ expect(s.summary.totalSize).toEqual(512*1024 + 100);
  });
  it('decreases summary when removing files', function() {
  var s = new FileSummary($container);
  s.setSummary({
  totalDirs: 5,
  totalFiles: 2,
- totalSize: 256000
+ totalSize: 256*1024
  });
- s.remove({type: 'file', size: 128000});
+ s.remove({type: 'file', size: 128*1024});
  s.remove({type: 'dir', size: 100});
  s.update();
  expect($container.hasClass('hidden')).toEqual(false);
  expect($container.find('.dirinfo').text()).toEqual('4 folders');
  expect($container.find('.fileinfo').text()).toEqual('1 file');
- expect($container.find('.filesize').text()).toEqual('128 KB');
+ expect($container.find('.filesize').text()).toEqual('128 KiB');
  expect(s.summary.totalDirs).toEqual(4);
  expect(s.summary.totalFiles).toEqual(1);
- expect(s.summary.totalSize).toEqual(127900);
+ expect(s.summary.totalSize).toEqual(128*1024 - 100);
  });
 
  it('renders filtered summary as text', function() {
  var s = new FileSummary($container);
  s.setSummary({
  totalDirs: 5,
  totalFiles: 2,
- totalSize: 256000,
+ totalSize: 256*1024,
  filter: 'foo'
  });
  expect($container.hasClass('hidden')).toEqual(false);
  expect($container.find('.dirinfo').text()).toEqual('5 folders');
  expect($container.find('.fileinfo').text()).toEqual('2 files');
  expect($container.find('.filter').text()).toEqual(' match "foo"');
- expect($container.find('.filesize').text()).toEqual('256 KB');
+ expect($container.find('.filesize').text()).toEqual('256 KiB');
  });
  it('hides filtered summary when no files or folders', function() {
  var s = new FileSummary($container);
@@ -121,44 +121,44 @@ describe('OCA.Files.FileSummary tests', function() {
  s.setSummary({
  totalDirs: 5,
  totalFiles: 2,
- totalSize: 256000,
+ totalSize: 256*1024,
  filter: 'foo'
  });
- s.add({name: 'bar.txt', type: 'file', size: 256000});
- s.add({name: 'foo.txt', type: 'file', size: 256001});
+ s.add({name: 'bar.txt', type: 'file', size: 256*1024});
+ s.add({name: 'foo.txt', type: 'file', size: 256*1024 + 1});
  s.add({name: 'bar', type: 'dir', size: 100});
  s.add({name: 'foo', type: 'dir', size: 102});
  s.update();
  expect($container.hasClass('hidden')).toEqual(false);
  expect($container.find('.dirinfo').text()).toEqual('6 folders');
  expect($container.find('.fileinfo').text()).toEqual('3 files');
  expect($container.find('.filter').text()).toEqual(' match "foo"');
- expect($container.find('.filesize').text()).toEqual('512 KB');
+ expect($container.find('.filesize').text()).toEqual('512 KiB');
  expect(s.summary.totalDirs).toEqual(6);
  expect(s.summary.totalFiles).toEqual(3);
- expect(s.summary.totalSize).toEqual(512103);
+ expect(s.summary.totalSize).toEqual(512*1024 + 1 + 102);
  });
  it('decreases filtered summary when removing files', function() {
  var s = new FileSummary($container);
  s.setSummary({
  totalDirs: 5,
  totalFiles: 2,
- totalSize: 256000,
+ totalSize: 256*1024,
  filter: 'foo'
  });
- s.remove({name: 'bar.txt', type: 'file', size: 128000});
- s.remove({name: 'foo.txt', type: 'file', size: 127999});
+ s.remove({name: 'bar.txt', type: 'file', size: 128*1024});
+ s.remove({name: 'foo.txt', type: 'file', size: 128*1024 - 1});
  s.remove({name: 'bar', type: 'dir', size: 100});
  s.remove({name: 'foo', type: 'dir', size: 98});
  s.update();
  expect($container.hasClass('hidden')).toEqual(false);
  expect($container.find('.dirinfo').text()).toEqual('4 folders');
  expect($container.find('.fileinfo').text()).toEqual('1 file');
  expect($container.find('.filter').text()).toEqual(' match "foo"');
- expect($container.find('.filesize').text()).toEqual('128 KB');
+ expect($container.find('.filesize').text()).toEqual('128 KiB');
  expect(s.summary.totalDirs).toEqual(4);
  expect(s.summary.totalFiles).toEqual(1);
- expect(s.summary.totalSize).toEqual(127903);
+ expect(s.summary.totalSize).toEqual(256*1024 - (128*1024 - 1) - 98);
  });
  it('properly sum up pending folder sizes after adding', function() {
  var s = new FileSummary($container);
@@ -206,41 +206,41 @@ describe('OCA.Files.FileSummary tests', function() {
  it('renders hidden count section when hidden files are hidden', function() {
  window._nc_event_bus.emit('files:config:updated', { key: 'show_hidden', value: false });
 
- summary.add({name: 'abc', type: 'file', size: 256000});
+ summary.add({name: 'abc', type: 'file', size: 256*1024});
  summary.add({name: 'def', type: 'dir', size: 100});
- summary.add({name: '.hidden', type: 'dir', size: 512000});
+ summary.add({name: '.hidden', type: 'dir', size: 512*1024});
  summary.update();
  expect($container.hasClass('hidden')).toEqual(false);
  expect($container.find('.dirinfo').text()).toEqual('2 folders');
  expect($container.find('.fileinfo').text()).toEqual('1 file');
  expect($container.find('.hiddeninfo').hasClass('hidden')).toEqual(false);
  expect($container.find('.hiddeninfo').text()).toEqual(' (including 1 hidden)');
- expect($container.find('.filesize').text()).toEqual('768 KB');
+ expect($container.find('.filesize').text()).toEqual('768 KiB');
  });
  it('does not render hidden count section when hidden files exist but are visible', function() {
  window._nc_event_bus.emit('files:config:updated', { key: 'show_hidden', value: true });
 
- summary.add({name: 'abc', type: 'file', size: 256000});
+ summary.add({name: 'abc', type: 'file', size: 256*1024});
  summary.add({name: 'def', type: 'dir', size: 100});
- summary.add({name: '.hidden', type: 'dir', size: 512000});
+ summary.add({name: '.hidden', type: 'dir', size: 512*1024});
  summary.update();
  expect($container.hasClass('hidden')).toEqual(false);
  expect($container.find('.dirinfo').text()).toEqual('2 folders');
  expect($container.find('.fileinfo').text()).toEqual('1 file');
  expect($container.find('.hiddeninfo').hasClass('hidden')).toEqual(true);
- expect($container.find('.filesize').text()).toEqual('768 KB');
+ expect($container.find('.filesize').text()).toEqual('768 KiB');
  });
  it('does not render hidden count section when no hidden files exist', function() {
  window._nc_event_bus.emit('files:config:updated', { key: 'show_hidden', value: false });
 
- summary.add({name: 'abc', type: 'file', size: 256000});
+ summary.add({name: 'abc', type: 'file', size: 256*1024});
  summary.add({name: 'def', type: 'dir', size: 100});
  summary.update();
  expect($container.hasClass('hidden')).toEqual(false);
  expect($container.find('.dirinfo').text()).toEqual('1 folder');
  expect($container.find('.fileinfo').text()).toEqual('1 file');
  expect($container.find('.hiddeninfo').hasClass('hidden')).toEqual(true);
- expect($container.find('.filesize').text()).toEqual('256 KB');
+ expect($container.find('.filesize').text()).toEqual('256 KiB');
  });
  });
 });

apps/files/tests/js/mainfileinfodetailviewSpec.js

@@ -62,7 +62,7 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
  view.setFileInfo(testFileInfo);
  expect(view.$el.find('.fileName h3').text()).toEqual('One.txt');
  expect(view.$el.find('.fileName h3').attr('title')).toEqual('One.txt');
- expect(view.$el.find('.size').text()).toEqual('123.5 MB');
+ expect(view.$el.find('.size').text()).toEqual('117.7 MiB');
  expect(view.$el.find('.size').attr('title')).toEqual('123456789 bytes');
  expect(view.$el.find('.date').text()).toEqual('seconds ago');
  expect(view.$el.find('.date').attr('title')).toEqual(dateExpected);

apps/files_sharing/tests/Controller/ShareControllerTest.php

@@ -801,7 +801,7 @@ public function testShareFileDrop() {
  'protected' => 'false',
  'dir' => null,
  'downloadURL' => '',
- 'fileSize' => '1 KB',
+ 'fileSize' => '1 KiB',
  'nonHumanFileSize' => 1337,
  'maxSizeAnimateGif' => null,
  'previewSupported' => null,

core/js/tests/specs/coreSpec.js

@@ -318,31 +318,32 @@ describe('Core base tests', function() {
  ['125.25 B', 125],
  ['0 B', 0],
  ['99999999999999999999999999999999999999999999 B', 99999999999999999999999999999999999999999999],
- ['0 MB', 0],
+ ['0 MiB', 0],
  ['0 kB', 0],
  ['0kB', 0],
  ['125 B', 125],
  ['125b', 125],
- ['125 KB', 128000],
+ ['125 KiB', 128000],
  ['125kb', 128000],
+ ['122.1 MiB', 128031130],
  ['122.1 MB', 128031130],
  ['122.1mb', 128031130],
  ['119.2 GB', 127990025421],
  ['119.2gb', 127990025421],
  ['116.4 TB', 127983153473126],
  ['116.4tb', 127983153473126],
  ['8776656778888777655.4tb', 9.650036181387265e+30],
- [1234, null],
+ [1234, 1234],
  [-1234, null],
  ['-1234 B', null],
  ['B', null],
  ['40/0', null],
- ['40,30 kb', null],
- [' 122.1 MB ', 128031130],
- ['122.1 MB ', 128031130],
- [' 122.1 MB ', 128031130],
- [' 122.1 MB ', 128031130],
- ['122.1 MB ', 128031130],
+ ['40,30 kb', 41267],
+ [' 122.1 MiB ', 128031130],
+ ['122.1 MiB ', 128031130],
+ [' 122.1 MiB ', 128031130],
+ [' 122.1 MiB ', 128031130],
+ ['122.1 MiB ', 128031130],
  [' 125', 125],
  [' 125 ', 125],
  ];
@@ -352,7 +353,7 @@ describe('Core base tests', function() {
  });
  it('returns null if the parameter is not a string', function() {
  expect(OC.Util.computerFileSize(NaN)).toEqual(null);
- expect(OC.Util.computerFileSize(125)).toEqual(null);
+ expect(OC.Util.computerFileSize(true)).toEqual(null);
  });
  it('returns null if the string is unparsable', function() {
  expect(OC.Util.computerFileSize('')).toEqual(null);