Fix FileActions merging override

When merging FileActions, the register() functio needs to correctly
override the previously merged action handler without affecting the
original one.

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index e06d2912274de01691e7855164aca555d3650f3b..cbfd047e98f9c8733aa3e378651c94e10fef53ed 100644 (file)
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -91,15 +91,11 @@
                        if (!this.actions[mime]) {
                                this.actions[mime] = {};
                        }
-                       if (!this.actions[mime][name]) {
-                               this.actions[mime][name] = {};
-                       }
-                       if (!displayName) {
-                               displayName = t('files', name);
-                       }
-                       this.actions[mime][name]['action'] = action;
-                       this.actions[mime][name]['permissions'] = permissions;
-                       this.actions[mime][name]['displayName'] = displayName;
+                       this.actions[mime][name] = {
+                               action: action,
+                               permissions: permissions,
+                               displayName: displayName || t('files', name)
+                       };
                        this.icons[name] = icon;
                        this._notifyUpdateListeners();
                },
@@ -314,7 +310,7 @@
                        });
 
                        this.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
-                               var dir = context.fileList.getCurrentDirectory();
+                               var dir = context.$file.attr('data-path') || context.fileList.getCurrentDirectory();
                                if (dir !== '/') {
                                        dir = dir + '/';
                                }

diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index f464800730a0d9d080af88c9017a8f2a63a3acda..f087239de9dd69f0c1c41716e1e455db2d9cf94a 100644 (file)
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -193,6 +193,156 @@ describe('OCA.Files.FileActions tests', function() {
                context = actionStub.getCall(0).args[1];
                expect(context.dir).toEqual('/somepath');
        });
+       describe('merging', function() {
+               var $tr;
+               beforeEach(function() {
+                       var fileData = {
+                               id: 18,
+                               type: 'file',
+                               name: 'testName.txt',
+                               path: '/anotherpath/there',
+                               mimetype: 'text/plain',
+                               size: '1234',
+                               etag: 'a01234c',
+                               mtime: '123456'
+                       };
+                       $tr = fileList.add(fileData);
+               });
+               afterEach(function() {
+                       $tr = null;
+               });
+               it('copies all actions to target file actions', function() {
+                       var actions1 = new OCA.Files.FileActions();
+                       var actions2 = new OCA.Files.FileActions();
+                       var actionStub1 = sinon.stub();
+                       var actionStub2 = sinon.stub();
+                       actions1.register(
+                                       'all',
+                                       'Test',
+                                       OC.PERMISSION_READ,
+                                       OC.imagePath('core', 'actions/test'),
+                                       actionStub1
+                       );
+                       actions2.register(
+                                       'all',
+                                       'Test2',
+                                       OC.PERMISSION_READ,
+                                       OC.imagePath('core', 'actions/test'),
+                                       actionStub2
+                       );
+                       actions2.merge(actions1);
+
+                       actions2.display($tr.find('td.filename'), true, fileList);
+
+                       expect($tr.find('.action-test').length).toEqual(1);
+                       expect($tr.find('.action-test2').length).toEqual(1);
+
+                       $tr.find('.action-test').click();
+                       expect(actionStub1.calledOnce).toEqual(true);
+                       expect(actionStub2.notCalled).toEqual(true);
+
+                       actionStub1.reset();
+
+                       $tr.find('.action-test2').click();
+                       expect(actionStub1.notCalled).toEqual(true);
+                       expect(actionStub2.calledOnce).toEqual(true);
+               });
+               it('overrides existing actions on merge', function() {
+                       var actions1 = new OCA.Files.FileActions();
+                       var actions2 = new OCA.Files.FileActions();
+                       var actionStub1 = sinon.stub();
+                       var actionStub2 = sinon.stub();
+                       actions1.register(
+                                       'all',
+                                       'Test',
+                                       OC.PERMISSION_READ,
+                                       OC.imagePath('core', 'actions/test'),
+                                       actionStub1
+                       );
+                       actions2.register(
+                                       'all',
+                                       'Test', // override
+                                       OC.PERMISSION_READ,
+                                       OC.imagePath('core', 'actions/test'),
+                                       actionStub2
+                       );
+                       actions1.merge(actions2);
+
+                       actions1.display($tr.find('td.filename'), true, fileList);
+
+                       expect($tr.find('.action-test').length).toEqual(1);
+
+                       $tr.find('.action-test').click();
+                       expect(actionStub1.notCalled).toEqual(true);
+                       expect(actionStub2.calledOnce).toEqual(true);
+               });
+               it('overrides existing action when calling register after merge', function() {
+                       var actions1 = new OCA.Files.FileActions();
+                       var actions2 = new OCA.Files.FileActions();
+                       var actionStub1 = sinon.stub();
+                       var actionStub2 = sinon.stub();
+                       actions1.register(
+                                       'all',
+                                       'Test',
+                                       OC.PERMISSION_READ,
+                                       OC.imagePath('core', 'actions/test'),
+                                       actionStub1
+                       );
+
+                       actions1.merge(actions2);
+
+                       // late override
+                       actions1.register(
+                                       'all',
+                                       'Test', // override
+                                       OC.PERMISSION_READ,
+                                       OC.imagePath('core', 'actions/test'),
+                                       actionStub2
+                       );
+
+                       actions1.display($tr.find('td.filename'), true, fileList);
+
+                       expect($tr.find('.action-test').length).toEqual(1);
+
+                       $tr.find('.action-test').click();
+                       expect(actionStub1.notCalled).toEqual(true);
+                       expect(actionStub2.calledOnce).toEqual(true);
+               });
+               it('leaves original file actions untouched (clean copy)', function() {
+                       var actions1 = new OCA.Files.FileActions();
+                       var actions2 = new OCA.Files.FileActions();
+                       var actionStub1 = sinon.stub();
+                       var actionStub2 = sinon.stub();
+                       actions1.register(
+                                       'all',
+                                       'Test',
+                                       OC.PERMISSION_READ,
+                                       OC.imagePath('core', 'actions/test'),
+                                       actionStub1
+                       );
+
+                       // copy the Test action to actions2
+                       actions2.merge(actions1);
+
+                       // late override
+                       actions2.register(
+                                       'all',
+                                       'Test', // override
+                                       OC.PERMISSION_READ,
+                                       OC.imagePath('core', 'actions/test'),
+                                       actionStub2
+                       );
+
+                       // check if original actions still call the correct handler
+                       actions1.display($tr.find('td.filename'), true, fileList);
+
+                       expect($tr.find('.action-test').length).toEqual(1);
+
+                       $tr.find('.action-test').click();
+                       expect(actionStub1.calledOnce).toEqual(true);
+                       expect(actionStub2.notCalled).toEqual(true);
+               });
+       });
        describe('events', function() {
                var clock;
                beforeEach(function() {