From 86735c6b5a6d46f1e66ae170e498446af786b98e Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 9 Jan 2016 22:07:34 +0100 Subject: [PATCH 1/2] Updating a file should not update the summary --- apps/files/js/filelist.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 0dbf4f938b..d5b30d6299 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1758,7 +1758,9 @@ updateRow: function($tr, fileInfo, options) { this.files.splice($tr.index(), 1); $tr.remove(); - $tr = this.add(fileInfo, _.extend({updateSummary: false, silent: true}, options)); + options = _.extend({silent: true}, options); + options = _.extend(options, {updateSummary: false}); + $tr = this.add(fileInfo, options); this.$fileList.trigger($.Event('fileActionsReady', {fileList: this, $files: $tr})); return $tr; }, From 665d7b25b04b8f2be28957bd0d87e6ef554db973 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 9 Jan 2016 22:47:26 +0100 Subject: [PATCH 2/2] Add unit test for file update --- apps/files/tests/js/filelistSpec.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 9dfcdfead7..e6046f2197 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -812,6 +812,22 @@ describe('OCA.Files.FileList tests', function() { .toEqual(OC.imagePath('core', 'filetypes/text.svg')); }); }); + describe('Update file', function() { + it('does not change summary', function() { + var $summary = $('#filestable .summary'); + var fileData = new FileInfo({ + type: 'file', + name: 'test file', + }); + var $tr = fileList.add(fileData); + + expect($summary.find('.info').text()).toEqual('0 folders and 1 file'); + + var model = fileList.getModelForFile('test file'); + model.set({size: '100'}); + expect($summary.find('.info').text()).toEqual('0 folders and 1 file'); + }); + }) describe('List rendering', function() { it('renders a list of files using add()', function() { expect(fileList.files.length).toEqual(0);