Updated unit tests for file actions and actions menu

1 files changed, 261 insertions, 286 deletions

diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index e420ab828af..8c43b917fa9 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -20,8 +20,7 @@
 */
 
 describe('OCA.Files.FileActions tests', function() {
-	var $filesTable, fileList;
-	var FileActions;
+	var fileList, fileActions;
 
 	beforeEach(function() {
 		// init horrible parameters
@@ -29,211 +28,175 @@ describe('OCA.Files.FileActions tests', function() {
 		$body.append('<input type="hidden" id="dir" value="/subdir"></input>');
 		$body.append('<input type="hidden" id="permissions" value="31"></input>');
 		// dummy files table
-		$filesTable = $body.append('<table id="filestable"></table>');
-		fileList = new OCA.Files.FileList($('#testArea'));
-		FileActions = new OCA.Files.FileActions();
-		FileActions.registerDefaultActions();
+		fileActions = new OCA.Files.FileActions();
+		fileActions.registerAction({
+			name: 'Testdropdown',
+			displayName: 'Testdropdowndisplay',
+			mime: 'all',
+			permissions: OC.PERMISSION_READ,
+			icon: function () {
+				return OC.imagePath('core', 'actions/download');
+			}
+		});
+
+		fileActions.registerAction({
+			name: 'Testinline',
+			displayName: 'Testinlinedisplay',
+			type: OCA.Files.FileActions.TYPE_INLINE,
+			mime: 'all',
+			permissions: OC.PERMISSION_READ
+		});
+
+		fileActions.registerAction({
+			name: 'Testdefault',
+			displayName: 'Testdefaultdisplay',
+			mime: 'all',
+			permissions: OC.PERMISSION_READ
+		});
+		fileActions.setDefault('all', 'Testdefault');
+		fileList = new OCA.Files.FileList($body, {
+			fileActions: fileActions
+		});
 	});
 	afterEach(function() {
-		FileActions = null;
+		fileActions = null;
 		fileList.destroy();
 		fileList = undefined;
 		$('#dir, #permissions, #filestable').remove();
 	});
 	it('calling clear() clears file actions', function() {
-		FileActions.clear();
-		expect(FileActions.actions).toEqual({});
-		expect(FileActions.defaults).toEqual({});
-		expect(FileActions.icons).toEqual({});
-		expect(FileActions.currentFile).toBe(null);
-	});
-	it('calling display() sets file actions', function() {
-		var fileData = {
-			id: 18,
-			type: 'file',
-			name: 'testName.txt',
-			mimetype: 'text/plain',
-			size: '1234',
-			etag: 'a01234c',
-			mtime: '123456'
-		};
-
-		// note: FileActions.display() is called implicitly
-		var $tr = fileList.add(fileData);
-
-		// actions defined after call
-		expect($tr.find('.action.action-download').length).toEqual(1);
-		expect($tr.find('.action.action-download').attr('data-action')).toEqual('Download');
-		expect($tr.find('.nametext .action.action-rename').length).toEqual(1);
-		expect($tr.find('.nametext .action.action-rename').attr('data-action')).toEqual('Rename');
-		expect($tr.find('.action.delete').length).toEqual(1);
-	});
-	it('calling display() twice correctly replaces file actions', function() {
-		var fileData = {
-			id: 18,
-			type: 'file',
-			name: 'testName.txt',
-			mimetype: 'text/plain',
-			size: '1234',
-			etag: 'a01234c',
-			mtime: '123456'
-		};
-		var $tr = fileList.add(fileData);
-
-		FileActions.display($tr.find('td.filename'), true, fileList);
-		FileActions.display($tr.find('td.filename'), true, fileList);
-
-		// actions defined after cal
-		expect($tr.find('.action.action-download').length).toEqual(1);
-		expect($tr.find('.nametext .action.action-rename').length).toEqual(1);
-		expect($tr.find('.action.delete').length).toEqual(1);
-	});
-	it('redirects to download URL when clicking download', function() {
-		var redirectStub = sinon.stub(OC, 'redirect');
-		var fileData = {
-			id: 18,
-			type: 'file',
-			name: 'testName.txt',
-			mimetype: 'text/plain',
-			size: '1234',
-			etag: 'a01234c',
-			mtime: '123456'
-		};
-		var $tr = fileList.add(fileData);
-		FileActions.display($tr.find('td.filename'), true, fileList);
-
-		$tr.find('.action-download').click();
-
-		expect(redirectStub.calledOnce).toEqual(true);
-		expect(redirectStub.getCall(0).args[0]).toContain(
-			OC.webroot +
-			'/index.php/apps/files/ajax/download.php' +
-			'?dir=%2Fsubdir&files=testName.txt');
-		redirectStub.restore();
+		fileActions.clear();
+		expect(fileActions.actions).toEqual({});
+		expect(fileActions.defaults).toEqual({});
+		expect(fileActions.icons).toEqual({});
+		expect(fileActions.currentFile).toBe(null);
 	});
-	it('takes the file\'s path into account when clicking download', function() {
-		var redirectStub = sinon.stub(OC, 'redirect');
-		var fileData = {
-			id: 18,
-			type: 'file',
-			name: 'testName.txt',
-			path: '/anotherpath/there',
-			mimetype: 'text/plain',
-			size: '1234',
-			etag: 'a01234c',
-			mtime: '123456'
-		};
-		var $tr = fileList.add(fileData);
-		FileActions.display($tr.find('td.filename'), true, fileList);
-
-		$tr.find('.action-download').click();
-
-		expect(redirectStub.calledOnce).toEqual(true);
-		expect(redirectStub.getCall(0).args[0]).toContain(
-			OC.webroot + '/index.php/apps/files/ajax/download.php' +
-			'?dir=%2Fanotherpath%2Fthere&files=testName.txt'
-		);
-		redirectStub.restore();
-	});
-	it('deletes file when clicking delete', function() {
-		var deleteStub = sinon.stub(fileList, 'do_delete');
-		var fileData = {
-			id: 18,
-			type: 'file',
-			name: 'testName.txt',
-			path: '/somepath/dir',
-			mimetype: 'text/plain',
-			size: '1234',
-			etag: 'a01234c',
-			mtime: '123456'
-		};
-		var $tr = fileList.add(fileData);
-		FileActions.display($tr.find('td.filename'), true, fileList);
-
-		$tr.find('.action.delete').click();
-
-		expect(deleteStub.calledOnce).toEqual(true);
-		expect(deleteStub.getCall(0).args[0]).toEqual('testName.txt');
-		expect(deleteStub.getCall(0).args[1]).toEqual('/somepath/dir');
-		deleteStub.restore();
-	});
-	it('shows delete hint when no permission to delete', function() {
-		var deleteStub = sinon.stub(fileList, 'do_delete');
-		var fileData = {
-			id: 18,
-			type: 'file',
-			name: 'testName.txt',
-			path: '/somepath/dir',
-			mimetype: 'text/plain',
-			size: '1234',
-			etag: 'a01234c',
-			mtime: '123456',
-			permissions: OC.PERMISSION_READ
-		};
-		var $tr = fileList.add(fileData);
-		FileActions.display($tr.find('td.filename'), true, fileList);
+	describe('displaying actions', function() {
+		var $tr;
 
-		var $action = $tr.find('.action.delete');
+		beforeEach(function() {
+			var fileData = {
+				id: 18,
+				type: 'file',
+				name: 'testName.txt',
+				mimetype: 'text/plain',
+				size: '1234',
+				etag: 'a01234c',
+				mtime: '123456',
+				permissions: OC.PERMISSION_READ | OC.PERMISSION_UPDATE
+			};
 
-		expect($action.hasClass('no-permission')).toEqual(true);
-		deleteStub.restore();
-	});
-	it('shows delete hint not when permission to delete', function() {
-		var deleteStub = sinon.stub(fileList, 'do_delete');
-		var fileData = {
-			id: 18,
-			type: 'file',
-			name: 'testName.txt',
-			path: '/somepath/dir',
-			mimetype: 'text/plain',
-			size: '1234',
-			etag: 'a01234c',
-			mtime: '123456',
-			permissions: OC.PERMISSION_DELETE
-		};
-		var $tr = fileList.add(fileData);
-		FileActions.display($tr.find('td.filename'), true, fileList);
-
-		var $action = $tr.find('.action.delete');
-
-		expect($action.hasClass('no-permission')).toEqual(false);
-		deleteStub.restore();
+			// note: FileActions.display() is called implicitly
+			$tr = fileList.add(fileData);
+		});
+		it('renders inline file actions', function() {
+			// actions defined after call
+			expect($tr.find('.action.action-testinline').length).toEqual(1);
+			expect($tr.find('.action.action-testinline').attr('data-action')).toEqual('Testinline');
+		});
+		it('does not render dropdown actions', function() {
+			expect($tr.find('.action.action-testdropdown').length).toEqual(0);
+		});
+		it('does not render default action', function() {
+			expect($tr.find('.action.action-testdefault').length).toEqual(0);
+		});
+		it('replaces file actions when displayed twice', function() {
+			fileActions.display($tr.find('td.filename'), true, fileList);
+			fileActions.display($tr.find('td.filename'), true, fileList);
+
+			expect($tr.find('.action.action-testinline').length).toEqual(1);
+		});
+		it('renders actions menu trigger', function() {
+			expect($tr.find('.action.action-menu').length).toEqual(1);
+			expect($tr.find('.action.action-menu').attr('data-action')).toEqual('menu');
+		});
+		it('only renders actions relevant to the mime type', function() {
+			fileActions.registerAction({
+				name: 'Match',
+				displayName: 'MatchDisplay',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'text/plain',
+				permissions: OC.PERMISSION_READ
+			});
+			fileActions.registerAction({
+				name: 'Nomatch',
+				displayName: 'NoMatchDisplay',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'application/octet-stream',
+				permissions: OC.PERMISSION_READ
+			});
+
+			fileActions.display($tr.find('td.filename'), true, fileList);
+			expect($tr.find('.action.action-match').length).toEqual(1);
+			expect($tr.find('.action.action-nomatch').length).toEqual(0);
+		});
+		it('only renders actions relevant to the permissions', function() {
+			fileActions.registerAction({
+				name: 'Match',
+				displayName: 'MatchDisplay',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'text/plain',
+				permissions: OC.PERMISSION_UPDATE
+			});
+			fileActions.registerAction({
+				name: 'Nomatch',
+				displayName: 'NoMatchDisplay',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'text/plain',
+				permissions: OC.PERMISSION_DELETE
+			});
+
+			fileActions.display($tr.find('td.filename'), true, fileList);
+			expect($tr.find('.action.action-match').length).toEqual(1);
+			expect($tr.find('.action.action-nomatch').length).toEqual(0);
+		});
 	});
-	it('passes context to action handler', function() {
-		var actionStub = sinon.stub();
-		var fileData = {
-			id: 18,
-			type: 'file',
-			name: 'testName.txt',
-			mimetype: 'text/plain',
-			size: '1234',
-			etag: 'a01234c',
-			mtime: '123456'
-		};
-		var $tr = fileList.add(fileData);
-		FileActions.register(
-				'all',
-				'Test',
-				OC.PERMISSION_READ,
-				OC.imagePath('core', 'actions/test'),
-				actionStub
-		);
-		FileActions.display($tr.find('td.filename'), true, fileList);
-		$tr.find('.action-test').click();
-		expect(actionStub.calledOnce).toEqual(true);
-		expect(actionStub.getCall(0).args[0]).toEqual('testName.txt');
-		var context = actionStub.getCall(0).args[1];
-		expect(context.$file.is($tr)).toEqual(true);
-		expect(context.fileList).toBeDefined();
-		expect(context.fileActions).toBeDefined();
-		expect(context.dir).toEqual('/subdir');
-
-		// when data-path is defined
-		actionStub.reset();
-		$tr.attr('data-path', '/somepath');
-		$tr.find('.action-test').click();
-		context = actionStub.getCall(0).args[1];
-		expect(context.dir).toEqual('/somepath');
+	describe('action handler', function() {
+		var actionStub, $tr;
+
+		beforeEach(function() {
+			var fileData = {
+				id: 18,
+				type: 'file',
+				name: 'testName.txt',
+				mimetype: 'text/plain',
+				size: '1234',
+				etag: 'a01234c',
+				mtime: '123456'
+			};
+			actionStub = sinon.stub();
+			fileActions.registerAction({
+				name: 'Test',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'all',
+				icon: OC.imagePath('core', 'actions/test'), 
+				permissions: OC.PERMISSION_READ,
+				actionHandler: actionStub
+			});
+			$tr = fileList.add(fileData);
+		});
+		it('passes context to action handler', function() {
+			$tr.find('.action-test').click();
+			expect(actionStub.calledOnce).toEqual(true);
+			expect(actionStub.getCall(0).args[0]).toEqual('testName.txt');
+			var context = actionStub.getCall(0).args[1];
+			expect(context.$file.is($tr)).toEqual(true);
+			expect(context.fileList).toBeDefined();
+			expect(context.fileActions).toBeDefined();
+			expect(context.dir).toEqual('/subdir');
+
+			// when data-path is defined
+			actionStub.reset();
+			$tr.attr('data-path', '/somepath');
+			$tr.find('.action-test').click();
+			context = actionStub.getCall(0).args[1];
+			expect(context.dir).toEqual('/somepath');
+		});
+		it('shows actions menu when clicking the menu trigger', function() {
+			expect($tr.find('.menu').length).toEqual(0);
+			$tr.find('.action-menu').click();
+			expect($tr.find('.menu').length).toEqual(1);
+		});
 	});
 	describe('custom rendering', function() {
 		var $tr;
@@ -251,10 +214,11 @@ describe('OCA.Files.FileActions tests', function() {
 		});
 		it('regular function', function() {
 			var actionStub = sinon.stub();
-			FileActions.registerAction({
+			fileActions.registerAction({
 				name: 'Test',
 				displayName: '',
 				mime: 'all',
+				type: OCA.Files.FileActions.TYPE_INLINE,
 				permissions: OC.PERMISSION_READ,
 				render: function(actionSpec, isDefault, context) {
 					expect(actionSpec.name).toEqual('Test');
@@ -266,13 +230,13 @@ describe('OCA.Files.FileActions tests', function() {
 					expect(context.fileList).toEqual(fileList);
 					expect(context.$file[0]).toEqual($tr[0]);
 
-					var $customEl = $('<a href="#"><span>blabli</span><span>blabla</span></a>');
+					var $customEl = $('<a class="action action-test" href="#"><span>blabli</span><span>blabla</span></a>');
 					$tr.find('td:first').append($customEl);
 					return $customEl;
 				},
 				actionHandler: actionStub
 			});
-			FileActions.display($tr.find('td.filename'), true, fileList);
+			fileActions.display($tr.find('td.filename'), true, fileList);
 
 			var $actionEl = $tr.find('td:first .action-test');
 			expect($actionEl.length).toEqual(1);
@@ -306,20 +270,22 @@ describe('OCA.Files.FileActions tests', function() {
 			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
-			);
+			actions1.registerAction({
+				name: 'Test',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'all',
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub1
+			});
+			actions2.registerAction({
+				name: 'Test2',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'all',
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub2
+			});
 			actions2.merge(actions1);
 
 			actions2.display($tr.find('td.filename'), true, fileList);
@@ -342,20 +308,22 @@ describe('OCA.Files.FileActions tests', function() {
 			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.registerAction({
+				name: 'Test',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'all',
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub1
+			});
+			actions2.registerAction({
+				name: 'Test', // override
+				mime: 'all',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub2
+			});
 			actions1.merge(actions2);
 
 			actions1.display($tr.find('td.filename'), true, fileList);
@@ -371,24 +339,26 @@ describe('OCA.Files.FileActions tests', function() {
 			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.registerAction({
+				mime: 'all',
+				name: 'Test',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub1
+			});
 
 			actions1.merge(actions2);
 
 			// late override
-			actions1.register(
-					'all',
-					'Test', // override
-					OC.PERMISSION_READ,
-					OC.imagePath('core', 'actions/test'),
-					actionStub2
-			);
+			actions1.registerAction({
+				mime: 'all',
+				name: 'Test', // override
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub2
+			});
 
 			actions1.display($tr.find('td.filename'), true, fileList);
 
@@ -403,25 +373,27 @@ describe('OCA.Files.FileActions tests', function() {
 			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.registerAction({
+				mime: 'all',
+				name: 'Test',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: 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
-			);
+			actions2.registerAction({
+				mime: 'all',
+				name: 'Test', // override
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub2
+			});
 
 			// check if original actions still call the correct handler
 			actions1.display($tr.find('td.filename'), true, fileList);
@@ -444,42 +416,45 @@ describe('OCA.Files.FileActions tests', function() {
 		it('notifies update event handlers once after multiple changes', function() {
 			var actionStub = sinon.stub();
 			var handler = sinon.stub();
-			FileActions.on('registerAction', handler);
-			FileActions.register(
-					'all',
-					'Test',
-					OC.PERMISSION_READ,
-					OC.imagePath('core', 'actions/test'),
-					actionStub
-			);
-			FileActions.register(
-					'all',
-					'Test2',
-					OC.PERMISSION_READ,
-					OC.imagePath('core', 'actions/test'),
-					actionStub
-			);
+			fileActions.on('registerAction', handler);
+			fileActions.registerAction({
+				mime: 'all',
+				name: 'Test',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub
+			});
+			fileActions.registerAction({
+				mime: 'all',
+				name: 'Test2',
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub
+			});
 			expect(handler.calledTwice).toEqual(true);
 		});
 		it('does not notifies update event handlers after unregistering', function() {
 			var actionStub = sinon.stub();
 			var handler = sinon.stub();
-			FileActions.on('registerAction', handler);
-			FileActions.off('registerAction', handler);
-			FileActions.register(
-					'all',
-					'Test',
-					OC.PERMISSION_READ,
-					OC.imagePath('core', 'actions/test'),
-					actionStub
-			);
-			FileActions.register(
-					'all',
-					'Test2',
-					OC.PERMISSION_READ,
-					OC.imagePath('core', 'actions/test'),
-					actionStub
-			);
+			fileActions.on('registerAction', handler);
+			fileActions.off('registerAction', handler);
+			fileActions.registerAction({
+				mime: 'all',
+				name: 'Test',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub
+			});
+			fileActions.registerAction({
+				mime: 'all',
+				name: 'Test2',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				permissions: OC.PERMISSION_READ,
+				icon: OC.imagePath('core', 'actions/test'),
+				actionHandler: actionStub
+			});
 			expect(handler.notCalled).toEqual(true);
 		});
 	});