' +
+ '
' +
+ '' +
+ '
' +
+ '' +
+ '
' +
+ '
-
-
-
-
-
-
-t('Nothing in here. Upload something!'))?>
-
-
-
-|
-
-
-
- t( 'Name' )); ?>
-
-
-
-
- |
- t('Size')); ?> | -
- t( 'Modified' )); ?>
-
-
- t('Delete'))?>
- |
-
|---|
-
-- t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?> -
-
-
+
+printPage(); ?>
+- t('Files are being scanned, please wait.'));?> -
-- t('Current scanning'));?> -
-
+
+
-
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
new file mode 100644
index 0000000000000000000000000000000000000000..17bf3b3de837e4d8df0727970dd558dd936b902a
--- /dev/null
+++ b/apps/files/templates/list.php
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+t('Nothing in here. Upload something!'))?>
+
+|
+
+
+
+ t( 'Name' )); ?>
+
+
+
+
+ |
+ + t('Size')); ?> + | +
+ t( 'Modified' )); ?>
+
+ t('Delete'))?>
+ |
+
|---|
+
++ t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?> +
+
+
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 74ca1e4495da1409742df4fb142ba2eacc54ad5b..9928053e5015ac0861f604e5a84cd76b1c771e97 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -24,6 +24,16 @@
class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
private static $user;
+ /**
+ * @var PHPUnit_Framework_MockObject_MockObject
+ */
+ private $viewMock;
+
+ /**
+ * @var \OCA\Files\App
+ */
+ private $files;
+
function setUp() {
// mock OC_L10n
if (!self::$user) {
@@ -56,7 +66,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief test rename of file/folder
+ * test rename of file/folder
*/
function testRenameFolder() {
$dir = '/';
@@ -72,7 +82,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
->method('getFileInfo')
->will($this->returnValue(new \OC\Files\FileInfo(
'/',
- null,
+ new \OC\Files\Storage\Local(array('datadir' => '/')),
'/',
array(
'fileid' => 123,
diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b3603cd5633197d272898ac71d0744ddeb2ffcb
--- /dev/null
+++ b/apps/files/tests/helper.php
@@ -0,0 +1,98 @@
+
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once __DIR__ . '/../lib/helper.php';
+
+use OCA\Files;
+
+/**
+ * Class Test_Files_Helper
+ */
+class Test_Files_Helper extends \PHPUnit_Framework_TestCase {
+
+ private function makeFileInfo($name, $size, $mtime, $isDir = false) {
+ return new \OC\Files\FileInfo(
+ '/',
+ null,
+ '/',
+ array(
+ 'name' => $name,
+ 'size' => $size,
+ 'mtime' => $mtime,
+ 'type' => $isDir ? 'dir' : 'file',
+ 'mimetype' => $isDir ? 'httpd/unix-directory' : 'application/octet-stream'
+ )
+ );
+ }
+
+ /**
+ * Returns a file list for testing
+ */
+ private function getTestFileList() {
+ return array(
+ self::makeFileInfo('a.txt', 4, 1000),
+ self::makeFileInfo('q.txt', 5, 150),
+ self::makeFileInfo('subdir2', 87, 128, true),
+ self::makeFileInfo('b.txt', 166, 800),
+ self::makeFileInfo('o.txt', 12, 100),
+ self::makeFileInfo('subdir', 88, 125, true),
+ );
+ }
+
+ function sortDataProvider() {
+ return array(
+ array(
+ 'name',
+ false,
+ array('subdir', 'subdir2', 'a.txt', 'b.txt', 'o.txt', 'q.txt'),
+ ),
+ array(
+ 'name',
+ true,
+ array('q.txt', 'o.txt', 'b.txt', 'a.txt', 'subdir2', 'subdir'),
+ ),
+ array(
+ 'size',
+ false,
+ array('a.txt', 'q.txt', 'o.txt', 'subdir2', 'subdir', 'b.txt'),
+ ),
+ array(
+ 'size',
+ true,
+ array('b.txt', 'subdir', 'subdir2', 'o.txt', 'q.txt', 'a.txt'),
+ ),
+ array(
+ 'mtime',
+ false,
+ array('o.txt', 'subdir', 'subdir2', 'q.txt', 'b.txt', 'a.txt'),
+ ),
+ array(
+ 'mtime',
+ true,
+ array('a.txt', 'b.txt', 'q.txt', 'subdir2', 'subdir', 'o.txt'),
+ ),
+ );
+ }
+
+ /**
+ * @dataProvider sortDataProvider
+ */
+ public function testSortByName($sort, $sortDescending, $expectedOrder) {
+ $files = self::getTestFileList();
+ $files = \OCA\Files\Helper::sortFiles($files, $sort, $sortDescending);
+ $fileNames = array();
+ foreach ($files as $fileInfo) {
+ $fileNames[] = $fileInfo->getName();
+ }
+ $this->assertEquals(
+ $expectedOrder,
+ $fileNames
+ );
+ }
+
+}
diff --git a/apps/files/tests/js/appSpec.js b/apps/files/tests/js/appSpec.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e9abad6989c9c84b04e82a532aaeee309bcd103
--- /dev/null
+++ b/apps/files/tests/js/appSpec.js
@@ -0,0 +1,220 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry + t('Files are being scanned, please wait.'));?> +
++ t('Currently scanning'));?> +
+' +
+ '' +
+ '
' +
+ ''
+ );
+
+ pushStateStub = sinon.stub(OC.Util.History, 'pushState');
+ parseUrlQueryStub = sinon.stub(OC.Util.History, 'parseUrlQuery');
+ parseUrlQueryStub.returns({});
+
+ App.initialize();
+ });
+ afterEach(function() {
+ App.navigation = null;
+ App.fileList = null;
+ App.files = null;
+ App.fileActions.clear();
+ App.fileActions = null;
+
+ pushStateStub.restore();
+ parseUrlQueryStub.restore();
+ });
+
+ describe('initialization', function() {
+ it('initializes the default file list with the default file actions', function() {
+ expect(App.fileList).toBeDefined();
+ expect(App.fileList.fileActions.actions.all).toBeDefined();
+ expect(App.fileList.$el.is('#app-content-files')).toEqual(true);
+ });
+ });
+
+ describe('URL handling', function() {
+ it('pushes the state to the URL when current app changed directory', function() {
+ $('#app-content-files').trigger(new $.Event('changeDirectory', {dir: 'subdir'}));
+ expect(pushStateStub.calledOnce).toEqual(true);
+ expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir');
+ expect(pushStateStub.getCall(0).args[0].view).not.toBeDefined();
+
+ $('li[data-id=other]>a').click();
+ pushStateStub.reset();
+
+ $('#app-content-other').trigger(new $.Event('changeDirectory', {dir: 'subdir'}));
+ expect(pushStateStub.calledOnce).toEqual(true);
+ expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir');
+ expect(pushStateStub.getCall(0).args[0].view).toEqual('other');
+ });
+ describe('onpopstate', function() {
+ it('sends "urlChanged" event to current app', function() {
+ var handler = sinon.stub();
+ $('#app-content-files').on('urlChanged', handler);
+ App._onPopState({view: 'files', dir: '/somedir'});
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].view).toEqual('files');
+ expect(handler.getCall(0).args[0].dir).toEqual('/somedir');
+ });
+ it('sends "show" event to current app and sets navigation', function() {
+ var showHandlerFiles = sinon.stub();
+ var showHandlerOther = sinon.stub();
+ var hideHandlerFiles = sinon.stub();
+ var hideHandlerOther = sinon.stub();
+ $('#app-content-files').on('show', showHandlerFiles);
+ $('#app-content-files').on('hide', hideHandlerFiles);
+ $('#app-content-other').on('show', showHandlerOther);
+ $('#app-content-other').on('hide', hideHandlerOther);
+ App._onPopState({view: 'other', dir: '/somedir'});
+ expect(showHandlerFiles.notCalled).toEqual(true);
+ expect(hideHandlerFiles.calledOnce).toEqual(true);
+ expect(showHandlerOther.calledOnce).toEqual(true);
+ expect(hideHandlerOther.notCalled).toEqual(true);
+
+ showHandlerFiles.reset();
+ showHandlerOther.reset();
+ hideHandlerFiles.reset();
+ hideHandlerOther.reset();
+
+ App._onPopState({view: 'files', dir: '/somedir'});
+ expect(showHandlerFiles.calledOnce).toEqual(true);
+ expect(hideHandlerFiles.notCalled).toEqual(true);
+ expect(showHandlerOther.notCalled).toEqual(true);
+ expect(hideHandlerOther.calledOnce).toEqual(true);
+
+ expect(App.navigation.getActiveItem()).toEqual('files');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+ expect($('#app-content-other').hasClass('hidden')).toEqual(true);
+ });
+ it('does not send "show" or "hide" event to current app when already visible', function() {
+ var showHandler = sinon.stub();
+ var hideHandler = sinon.stub();
+ $('#app-content-files').on('show', showHandler);
+ $('#app-content-files').on('hide', hideHandler);
+ App._onPopState({view: 'files', dir: '/somedir'});
+ expect(showHandler.notCalled).toEqual(true);
+ expect(hideHandler.notCalled).toEqual(true);
+ });
+ it('state defaults to files app with root dir', function() {
+ var handler = sinon.stub();
+ parseUrlQueryStub.returns({});
+ $('#app-content-files').on('urlChanged', handler);
+ App._onPopState();
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].view).toEqual('files');
+ expect(handler.getCall(0).args[0].dir).toEqual('/');
+ });
+ it('activates files app if invalid view is passed', function() {
+ App._onPopState({view: 'invalid', dir: '/somedir'});
+
+ expect(App.navigation.getActiveItem()).toEqual('files');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+ });
+ });
+ describe('navigation', function() {
+ it('switches the navigation item and panel visibility when onpopstate', function() {
+ App._onPopState({view: 'other', dir: '/somedir'});
+ expect(App.navigation.getActiveItem()).toEqual('other');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(true);
+ expect($('#app-content-other').hasClass('hidden')).toEqual(false);
+ expect($('li[data-id=files]').hasClass('selected')).toEqual(false);
+ expect($('li[data-id=other]').hasClass('selected')).toEqual(true);
+
+ App._onPopState({view: 'files', dir: '/somedir'});
+
+ expect(App.navigation.getActiveItem()).toEqual('files');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+ expect($('#app-content-other').hasClass('hidden')).toEqual(true);
+ expect($('li[data-id=files]').hasClass('selected')).toEqual(true);
+ expect($('li[data-id=other]').hasClass('selected')).toEqual(false);
+ });
+ it('clicking on navigation switches the panel visibility', function() {
+ $('li[data-id=other]>a').click();
+ expect(App.navigation.getActiveItem()).toEqual('other');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(true);
+ expect($('#app-content-other').hasClass('hidden')).toEqual(false);
+ expect($('li[data-id=files]').hasClass('selected')).toEqual(false);
+ expect($('li[data-id=other]').hasClass('selected')).toEqual(true);
+
+ $('li[data-id=files]>a').click();
+ expect(App.navigation.getActiveItem()).toEqual('files');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+ expect($('#app-content-other').hasClass('hidden')).toEqual(true);
+ expect($('li[data-id=files]').hasClass('selected')).toEqual(true);
+ expect($('li[data-id=other]').hasClass('selected')).toEqual(false);
+ });
+ it('clicking on navigation sends "show" and "urlChanged" event', function() {
+ var handler = sinon.stub();
+ var showHandler = sinon.stub();
+ $('#app-content-other').on('urlChanged', handler);
+ $('#app-content-other').on('show', showHandler);
+ $('li[data-id=other]>a').click();
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].view).toEqual('other');
+ expect(handler.getCall(0).args[0].dir).toEqual('/');
+ expect(showHandler.calledOnce).toEqual(true);
+ });
+ it('clicking on activate navigation only sends "urlChanged" event', function() {
+ var handler = sinon.stub();
+ var showHandler = sinon.stub();
+ $('#app-content-files').on('urlChanged', handler);
+ $('#app-content-files').on('show', showHandler);
+ $('li[data-id=files]>a').click();
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].view).toEqual('files');
+ expect(handler.getCall(0).args[0].dir).toEqual('/');
+ expect(showHandler.notCalled).toEqual(true);
+ });
+ });
+ describe('viewer mode', function() {
+ it('toggles the sidebar when viewer mode is enabled', function() {
+ $('#app-content-files').trigger(
+ new $.Event('changeViewerMode', {viewerModeEnabled: true}
+ ));
+ expect($('#app-navigation').hasClass('hidden')).toEqual(true);
+ expect($('.app-files').hasClass('viewer-mode no-sidebar')).toEqual(true);
+
+ $('#app-content-files').trigger(
+ new $.Event('changeViewerMode', {viewerModeEnabled: false}
+ ));
+
+ expect($('#app-navigation').hasClass('hidden')).toEqual(false);
+ expect($('.app-files').hasClass('viewer-mode no-sidebar')).toEqual(false);
+ });
+ });
+ });
+});
diff --git a/apps/files/tests/js/breadcrumbSpec.js b/apps/files/tests/js/breadcrumbSpec.js
index 1bfe5308a278c0dcabfcff3a9661ec14c01b47fc..e3d9c757a7c0a1e01031b2ed6b28f56aefd448b4 100644
--- a/apps/files/tests/js/breadcrumbSpec.js
+++ b/apps/files/tests/js/breadcrumbSpec.js
@@ -20,7 +20,9 @@
*/
/* global BreadCrumb */
-describe('BreadCrumb tests', function() {
+describe('OCA.Files.BreadCrumb tests', function() {
+ var BreadCrumb = OCA.Files.BreadCrumb;
+
describe('Rendering', function() {
var bc;
beforeEach(function() {
diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index f5eafba509f6d5ed8925aa5831ddc1012367582a..9152dbb58c30a6961f3265698f95d7d70b53827e 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -19,35 +19,45 @@
*
*/
-/* global OC, FileActions, FileList */
-describe('FileActions tests', function() {
- var $filesTable;
+describe('OCA.Files.FileActions tests', function() {
+ var $filesTable, fileList;
+ var FileActions = OCA.Files.FileActions;
beforeEach(function() {
// init horrible parameters
- var $body = $('body');
+ var $body = $('#testArea');
$body.append('');
$body.append('');
// dummy files table
$filesTable = $body.append('' +
+ // init horrible parameters
'' +
'' +
// dummy controls
@@ -75,19 +66,24 @@ describe('FileList tests', function() {
' ' +
'
' +
// dummy table
- // TODO: at some point this will be rendered by the FileList class itself!
+ // TODO: at some point this will be rendered by the fileList class itself!
'' +
- '' +
- 'Name' +
+ '| ' +
+ '' +
+ 'Name' +
'' +
- ' | | ' + + ' | ' + + '' + + '' + '' + ' |
|---|
Empty content message
'
+ 'Empty content message
' +
+ ''
);
testFiles = [{
@@ -120,27 +116,27 @@ describe('FileList tests', function() {
etag: '456'
}];
- FileList.initialize();
+ fileList = new OCA.Files.FileList($('#app-content-files'));
+ FileActions.clear();
+ FileActions.registerDefaultActions(fileList);
+ fileList.setFileActions(FileActions);
});
afterEach(function() {
testFiles = undefined;
- FileList.initialized = false;
- FileList.isEmpty = true;
- delete FileList._reloadCall;
+ fileList = undefined;
- $('#dir, #permissions, #filestable').remove();
+ FileActions.clear();
notificationStub.restore();
alertStub.restore();
- pushStateStub.restore();
});
describe('Getters', function() {
it('Returns the current directory', function() {
$('#dir').val('/one/two/three');
- expect(FileList.getCurrentDirectory()).toEqual('/one/two/three');
+ expect(fileList.getCurrentDirectory()).toEqual('/one/two/three');
});
it('Returns the directory permissions as int', function() {
$('#permissions').val('23');
- expect(FileList.getDirectoryPermissions()).toEqual(23);
+ expect(fileList.getDirectoryPermissions()).toEqual(23);
});
});
describe('Adding files', function() {
@@ -158,12 +154,12 @@ describe('FileList tests', function() {
id: 18,
type: 'file',
name: 'testName.txt',
- mimetype: 'plain/text',
+ mimetype: 'text/plain',
size: '1234',
etag: 'a01234c',
mtime: '123456'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
expect($tr).toBeDefined();
expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -173,12 +169,14 @@ describe('FileList tests', function() {
expect($tr.attr('data-size')).toEqual('1234');
expect($tr.attr('data-etag')).toEqual('a01234c');
expect($tr.attr('data-permissions')).toEqual('31');
- expect($tr.attr('data-mime')).toEqual('plain/text');
+ expect($tr.attr('data-mime')).toEqual('text/plain');
expect($tr.attr('data-mtime')).toEqual('123456');
- expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=testName.txt');
+ expect($tr.find('a.name').attr('href'))
+ .toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=testName.txt');
+ expect($tr.find('.nametext').text().trim()).toEqual('testName.txt');
expect($tr.find('.filesize').text()).toEqual('1 kB');
- expect(FileList.findFileEl('testName.txt')[0]).toEqual($tr[0]);
+ expect(fileList.findFileEl('testName.txt')[0]).toEqual($tr[0]);
});
it('generates dir element with correct attributes when calling add() with dir data', function() {
var fileData = {
@@ -190,7 +188,7 @@ describe('FileList tests', function() {
etag: 'a01234c',
mtime: '123456'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
expect($tr).toBeDefined();
expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -205,7 +203,7 @@ describe('FileList tests', function() {
expect($tr.find('.filesize').text()).toEqual('1 kB');
- expect(FileList.findFileEl('testFolder')[0]).toEqual($tr[0]);
+ expect(fileList.findFileEl('testFolder')[0]).toEqual($tr[0]);
});
it('generates file element with default attributes when calling add() with minimal data', function() {
var fileData = {
@@ -213,8 +211,8 @@ describe('FileList tests', function() {
name: 'testFile.txt'
};
- clock.tick(123456);
- var $tr = FileList.add(fileData);
+ clock.tick(123456);
+ var $tr = fileList.add(fileData);
expect($tr).toBeDefined();
expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -234,8 +232,8 @@ describe('FileList tests', function() {
type: 'dir',
name: 'testFolder'
};
- clock.tick(123456);
- var $tr = FileList.add(fileData);
+ clock.tick(123456);
+ var $tr = fileList.add(fileData);
expect($tr).toBeDefined();
expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -256,7 +254,7 @@ describe('FileList tests', function() {
name: 'testFolder',
size: '0'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
expect($tr.find('.filesize').text()).toEqual('0 B');
});
it('adds new file to the end of the list', function() {
@@ -265,19 +263,19 @@ describe('FileList tests', function() {
type: 'file',
name: 'ZZZ.txt'
};
- FileList.setFiles(testFiles);
- $tr = FileList.add(fileData);
+ fileList.setFiles(testFiles);
+ $tr = fileList.add(fileData);
expect($tr.index()).toEqual(4);
});
it('inserts files in a sorted manner when insert option is enabled', function() {
var $tr;
for (var i = 0; i < testFiles.length; i++) {
- FileList.add(testFiles[i]);
+ fileList.add(testFiles[i]);
}
- expect(FileList.files[0].name).toEqual('somedir');
- expect(FileList.files[1].name).toEqual('One.txt');
- expect(FileList.files[2].name).toEqual('Three.pdf');
- expect(FileList.files[3].name).toEqual('Two.jpg');
+ expect(fileList.files[0].name).toEqual('somedir');
+ expect(fileList.files[1].name).toEqual('One.txt');
+ expect(fileList.files[2].name).toEqual('Three.pdf');
+ expect(fileList.files[3].name).toEqual('Two.jpg');
});
it('inserts new file at correct position', function() {
var $tr;
@@ -286,12 +284,12 @@ describe('FileList tests', function() {
name: 'P comes after O.txt'
};
for (var i = 0; i < testFiles.length; i++) {
- FileList.add(testFiles[i]);
+ fileList.add(testFiles[i]);
}
- $tr = FileList.add(fileData);
+ $tr = fileList.add(fileData);
// after "One.txt"
expect($tr.index()).toEqual(2);
- expect(FileList.files[2]).toEqual(fileData);
+ expect(fileList.files[2]).toEqual(fileData);
});
it('inserts new folder at correct position in insert mode', function() {
var $tr;
@@ -300,11 +298,11 @@ describe('FileList tests', function() {
name: 'somedir2 comes after somedir'
};
for (var i = 0; i < testFiles.length; i++) {
- FileList.add(testFiles[i]);
+ fileList.add(testFiles[i]);
}
- $tr = FileList.add(fileData);
+ $tr = fileList.add(fileData);
expect($tr.index()).toEqual(1);
- expect(FileList.files[1]).toEqual(fileData);
+ expect(fileList.files[1]).toEqual(fileData);
});
it('inserts new file at the end correctly', function() {
var $tr;
@@ -313,21 +311,22 @@ describe('FileList tests', function() {
name: 'zzz.txt'
};
for (var i = 0; i < testFiles.length; i++) {
- FileList.add(testFiles[i]);
+ fileList.add(testFiles[i]);
}
- $tr = FileList.add(fileData);
+ $tr = fileList.add(fileData);
expect($tr.index()).toEqual(4);
- expect(FileList.files[4]).toEqual(fileData);
+ expect(fileList.files[4]).toEqual(fileData);
});
it('removes empty content message and shows summary when adding first file', function() {
+ var $summary;
var fileData = {
type: 'file',
name: 'first file.txt',
size: 12
};
- FileList.setFiles([]);
- expect(FileList.isEmpty).toEqual(true);
- FileList.add(fileData);
+ fileList.setFiles([]);
+ expect(fileList.isEmpty).toEqual(true);
+ fileList.add(fileData);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(false);
// yes, ugly...
@@ -337,19 +336,20 @@ describe('FileList tests', function() {
expect($summary.find('.filesize').text()).toEqual('12 B');
expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
expect($('#emptycontent').hasClass('hidden')).toEqual(true);
- expect(FileList.isEmpty).toEqual(false);
+ expect(fileList.isEmpty).toEqual(false);
});
});
describe('Removing files from the list', function() {
it('Removes file from list when calling remove() and updates summary', function() {
+ var $summary;
var $removedEl;
- FileList.setFiles(testFiles);
- $removedEl = FileList.remove('One.txt');
+ fileList.setFiles(testFiles);
+ $removedEl = fileList.remove('One.txt');
expect($removedEl).toBeDefined();
expect($removedEl.attr('data-file')).toEqual('One.txt');
expect($('#fileList tr').length).toEqual(3);
- expect(FileList.files.length).toEqual(3);
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.files.length).toEqual(3);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(false);
@@ -357,27 +357,28 @@ describe('FileList tests', function() {
expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(false);
expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
expect($summary.find('.filesize').text()).toEqual('69 kB');
- expect(FileList.isEmpty).toEqual(false);
+ expect(fileList.isEmpty).toEqual(false);
});
it('Shows empty content when removing last file', function() {
- FileList.setFiles([testFiles[0]]);
- FileList.remove('One.txt');
+ var $summary;
+ fileList.setFiles([testFiles[0]]);
+ fileList.remove('One.txt');
expect($('#fileList tr').length).toEqual(0);
- expect(FileList.files.length).toEqual(0);
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.files.length).toEqual(0);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(true);
expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
expect($('#emptycontent').hasClass('hidden')).toEqual(false);
- expect(FileList.isEmpty).toEqual(true);
+ expect(fileList.isEmpty).toEqual(true);
});
});
describe('Deleting files', function() {
function doDelete() {
var request, query;
// note: normally called from FileActions
- FileList.do_delete(['One.txt', 'Two.jpg']);
+ fileList.do_delete(['One.txt', 'Two.jpg']);
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
@@ -387,7 +388,8 @@ describe('FileList tests', function() {
expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir', files: '["One.txt","Two.jpg"]'});
}
it('calls delete.php, removes the deleted entries and updates summary', function() {
- FileList.setFiles(testFiles);
+ var $summary;
+ fileList.setFiles(testFiles);
doDelete();
fakeServer.requests[0].respond(
@@ -396,10 +398,10 @@ describe('FileList tests', function() {
JSON.stringify({status: 'success'})
);
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
- expect(FileList.findFileEl('Two.jpg').length).toEqual(0);
- expect(FileList.findFileEl('Three.pdf').length).toEqual(1);
- expect(FileList.$fileList.find('tr').length).toEqual(2);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.findFileEl('Two.jpg').length).toEqual(0);
+ expect(fileList.findFileEl('Three.pdf').length).toEqual(1);
+ expect(fileList.$fileList.find('tr').length).toEqual(2);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(false);
@@ -407,28 +409,29 @@ describe('FileList tests', function() {
expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(false);
expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
expect($summary.find('.filesize').text()).toEqual('57 kB');
- expect(FileList.isEmpty).toEqual(false);
+ expect(fileList.isEmpty).toEqual(false);
expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
expect($('#emptycontent').hasClass('hidden')).toEqual(true);
expect(notificationStub.notCalled).toEqual(true);
});
it('shows spinner on files to be deleted', function() {
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
doDelete();
- expect(FileList.findFileEl('One.txt').find('.progress-icon:not(.delete-icon)').length).toEqual(1);
- expect(FileList.findFileEl('Three.pdf').find('.delete-icon:not(.progress-icon)').length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').find('.progress-icon:not(.delete-icon)').length).toEqual(1);
+ expect(fileList.findFileEl('Three.pdf').find('.delete-icon:not(.progress-icon)').length).toEqual(1);
});
it('shows spinner on all files when deleting all', function() {
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
- FileList.do_delete();
+ fileList.do_delete();
- expect(FileList.$fileList.find('tr .progress-icon:not(.delete-icon)').length).toEqual(4);
+ expect(fileList.$fileList.find('tr .progress-icon:not(.delete-icon)').length).toEqual(4);
});
it('updates summary when deleting last file', function() {
- FileList.setFiles([testFiles[0], testFiles[1]]);
+ var $summary;
+ fileList.setFiles([testFiles[0], testFiles[1]]);
doDelete();
fakeServer.requests[0].respond(
@@ -437,17 +440,17 @@ describe('FileList tests', function() {
JSON.stringify({status: 'success'})
);
- expect(FileList.$fileList.find('tr').length).toEqual(0);
+ expect(fileList.$fileList.find('tr').length).toEqual(0);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(true);
- expect(FileList.isEmpty).toEqual(true);
- expect(FileList.files.length).toEqual(0);
+ expect(fileList.isEmpty).toEqual(true);
+ expect(fileList.files.length).toEqual(0);
expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
expect($('#emptycontent').hasClass('hidden')).toEqual(false);
});
it('bring back deleted item when delete call failed', function() {
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
doDelete();
fakeServer.requests[0].respond(
@@ -457,36 +460,48 @@ describe('FileList tests', function() {
);
// files are still in the list
- expect(FileList.findFileEl('One.txt').length).toEqual(1);
- expect(FileList.findFileEl('Two.jpg').length).toEqual(1);
- expect(FileList.$fileList.find('tr').length).toEqual(4);
+ expect(fileList.findFileEl('One.txt').length).toEqual(1);
+ expect(fileList.findFileEl('Two.jpg').length).toEqual(1);
+ expect(fileList.$fileList.find('tr').length).toEqual(4);
expect(notificationStub.calledOnce).toEqual(true);
});
});
describe('Renaming files', function() {
+ function doCancelRename() {
+ var $input;
+ for (var i = 0; i < testFiles.length; i++) {
+ fileList.add(testFiles[i]);
+ }
+
+ // trigger rename prompt
+ fileList.rename('One.txt');
+ $input = fileList.$fileList.find('input.filename');
+ // keep same name
+ $input.val('One.txt');
+ // trigger submit because triggering blur doesn't work in all browsers
+ $input.closest('form').trigger('submit');
+
+ expect(fakeServer.requests.length).toEqual(0);
+ }
function doRename() {
var $input, request;
for (var i = 0; i < testFiles.length; i++) {
- FileList.add(testFiles[i]);
+ fileList.add(testFiles[i]);
}
// trigger rename prompt
- FileList.rename('One.txt');
- $input = FileList.$fileList.find('input.filename');
- $input.val('Tu_after_three.txt').blur();
+ fileList.rename('One.txt');
+ $input = fileList.$fileList.find('input.filename');
+ $input.val('Tu_after_three.txt');
+ // trigger submit because triggering blur doesn't work in all browsers
+ $input.closest('form').trigger('submit');
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
expect(request.url.substr(0, request.url.indexOf('?'))).toEqual(OC.webroot + '/index.php/apps/files/ajax/rename.php');
expect(OC.parseQueryString(request.url)).toEqual({'dir': '/subdir', newname: 'Tu_after_three.txt', file: 'One.txt'});
-
- // element is renamed before the request finishes
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
- expect(FileList.findFileEl('Tu_after_three.txt').length).toEqual(1);
- // input is gone
- expect(FileList.$fileList.find('input.filename').length).toEqual(0);
}
it('Inserts renamed file entry at correct position if rename ajax call suceeded', function() {
doRename();
@@ -500,9 +515,9 @@ describe('FileList tests', function() {
}));
// element stays renamed
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
- expect(FileList.findFileEl('Tu_after_three.txt').length).toEqual(1);
- expect(FileList.findFileEl('Tu_after_three.txt').index()).toEqual(2); // after Two.txt
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.findFileEl('Tu_after_three.txt').length).toEqual(1);
+ expect(fileList.findFileEl('Tu_after_three.txt').index()).toEqual(2); // after Two.txt
expect(alertStub.notCalled).toEqual(true);
});
@@ -517,9 +532,9 @@ describe('FileList tests', function() {
}));
// element was reverted
- expect(FileList.findFileEl('One.txt').length).toEqual(1);
- expect(FileList.findFileEl('One.txt').index()).toEqual(1); // after somedir
- expect(FileList.findFileEl('Tu_after_three.txt').length).toEqual(0);
+ expect(fileList.findFileEl('One.txt').length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').index()).toEqual(1); // after somedir
+ expect(fileList.findFileEl('Tu_after_three.txt').length).toEqual(0);
expect(alertStub.calledOnce).toEqual(true);
});
@@ -534,34 +549,63 @@ describe('FileList tests', function() {
}
}));
- $tr = FileList.findFileEl('Tu_after_three.txt');
+ $tr = fileList.findFileEl('Tu_after_three.txt');
expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=Tu_after_three.txt');
});
- // FIXME: fix this in the source code!
- xit('Correctly updates file link after rename when path has same name', function() {
- var $tr;
- // evil case: because of buggy code
- $('#dir').val('/One.txt/subdir');
+ it('Triggers "fileActionsReady" event after rename', function() {
+ var handler = sinon.stub();
+ fileList.$fileList.on('fileActionsReady', handler);
doRename();
-
+ expect(handler.notCalled).toEqual(true);
fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
status: 'success',
data: {
name: 'Tu_after_three.txt'
}
}));
+ expect(handler.calledOnce).toEqual(true);
+ expect(fileList.$fileList.find('.test').length).toEqual(0);
+ });
+ it('Leaves the summary alone when reinserting renamed element', function() {
+ var $summary = $('#filestable .summary');
+ doRename();
+ fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+ status: 'success',
+ data: {
+ name: 'Tu_after_three.txt'
+ }
+ }));
+ expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
+ });
+ it('Leaves the summary alone when cancel renaming', function() {
+ var $summary = $('#filestable .summary');
+ doCancelRename();
+ expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
+ });
+ it('Hides actions while rename in progress', function() {
+ var $tr;
+ doRename();
+
+ // element is renamed before the request finishes
+ $tr = fileList.findFileEl('Tu_after_three.txt');
+ expect($tr.length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
+ // file actions are hidden
+ expect($tr.find('.action').hasClass('hidden')).toEqual(true);
+ expect($tr.find('.fileactions').hasClass('hidden')).toEqual(true);
- $tr = FileList.findFileEl('Tu_after_three.txt');
- expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=One.txt');
+ // input and form are gone
+ expect(fileList.$fileList.find('input.filename').length).toEqual(0);
+ expect(fileList.$fileList.find('form').length).toEqual(0);
});
});
describe('Moving files', function() {
beforeEach(function() {
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
});
it('Moves single file to target folder', function() {
var request;
- FileList.move('One.txt', '/somedir');
+ fileList.move('One.txt', '/somedir');
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
@@ -576,17 +620,17 @@ describe('FileList tests', function() {
}
}));
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
// folder size has increased
- expect(FileList.findFileEl('somedir').data('size')).toEqual(262);
- expect(FileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B');
+ expect(fileList.findFileEl('somedir').data('size')).toEqual(262);
+ expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B');
expect(notificationStub.notCalled).toEqual(true);
});
it('Moves list of files to target folder', function() {
var request;
- FileList.move(['One.txt', 'Two.jpg'], '/somedir');
+ fileList.move(['One.txt', 'Two.jpg'], '/somedir');
expect(fakeServer.requests.length).toEqual(2);
request = fakeServer.requests[0];
@@ -605,11 +649,11 @@ describe('FileList tests', function() {
}
}));
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
// folder size has increased
- expect(FileList.findFileEl('somedir').data('size')).toEqual(262);
- expect(FileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B');
+ expect(fileList.findFileEl('somedir').data('size')).toEqual(262);
+ expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B');
fakeServer.requests[1].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
status: 'success',
@@ -619,17 +663,17 @@ describe('FileList tests', function() {
}
}));
- expect(FileList.findFileEl('Two.jpg').length).toEqual(0);
+ expect(fileList.findFileEl('Two.jpg').length).toEqual(0);
// 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').data('size')).toEqual(12311);
+ expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('12 kB');
expect(notificationStub.notCalled).toEqual(true);
});
it('Shows notification if a file could not be moved', function() {
var request;
- FileList.move('One.txt', '/somedir');
+ fileList.move('One.txt', '/somedir');
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
@@ -643,7 +687,7 @@ describe('FileList tests', function() {
}
}));
- expect(FileList.findFileEl('One.txt').length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').length).toEqual(1);
expect(notificationStub.calledOnce).toEqual(true);
expect(notificationStub.getCall(0).args[0]).toEqual('Error while moving file');
@@ -651,47 +695,47 @@ describe('FileList tests', function() {
});
describe('List rendering', function() {
it('renders a list of files using add()', function() {
- expect(FileList.files.length).toEqual(0);
- expect(FileList.files).toEqual([]);
- FileList.setFiles(testFiles);
+ expect(fileList.files.length).toEqual(0);
+ expect(fileList.files).toEqual([]);
+ fileList.setFiles(testFiles);
expect($('#fileList tr').length).toEqual(4);
- expect(FileList.files.length).toEqual(4);
- expect(FileList.files).toEqual(testFiles);
+ expect(fileList.files.length).toEqual(4);
+ expect(fileList.files).toEqual(testFiles);
});
it('updates summary using the file sizes', function() {
var $summary;
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
expect($summary.find('.filesize').text()).toEqual('69 kB');
});
it('shows headers, summary and hide empty content message after setting files', function(){
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
expect($('#emptycontent').hasClass('hidden')).toEqual(true);
- expect(FileList.$el.find('.summary').hasClass('hidden')).toEqual(false);
+ expect(fileList.$el.find('.summary').hasClass('hidden')).toEqual(false);
});
it('hides headers, summary and show empty content message after setting empty file list', function(){
- FileList.setFiles([]);
+ fileList.setFiles([]);
expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
expect($('#emptycontent').hasClass('hidden')).toEqual(false);
- expect(FileList.$el.find('.summary').hasClass('hidden')).toEqual(true);
+ expect(fileList.$el.find('.summary').hasClass('hidden')).toEqual(true);
});
it('hides headers, empty content message, and summary when list is empty and user has no creation permission', function(){
$('#permissions').val(0);
- FileList.setFiles([]);
+ fileList.setFiles([]);
expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
expect($('#emptycontent').hasClass('hidden')).toEqual(true);
- expect(FileList.$el.find('.summary').hasClass('hidden')).toEqual(true);
+ expect(fileList.$el.find('.summary').hasClass('hidden')).toEqual(true);
});
it('calling findFileEl() can find existing file element', function() {
- FileList.setFiles(testFiles);
- expect(FileList.findFileEl('Two.jpg').length).toEqual(1);
+ fileList.setFiles(testFiles);
+ expect(fileList.findFileEl('Two.jpg').length).toEqual(1);
});
it('calling findFileEl() returns empty when file not found in file', function() {
- FileList.setFiles(testFiles);
- expect(FileList.findFileEl('unexist.dat').length).toEqual(0);
+ fileList.setFiles(testFiles);
+ expect(fileList.findFileEl('unexist.dat').length).toEqual(0);
});
it('only add file if in same current directory', function() {
$('#dir').val('/current dir');
@@ -700,121 +744,122 @@ describe('FileList tests', function() {
name: 'testFile.txt',
directory: '/current dir'
};
- var $tr = FileList.add(fileData);
- expect(FileList.findFileEl('testFile.txt').length).toEqual(1);
+ var $tr = fileList.add(fileData);
+ expect(fileList.findFileEl('testFile.txt').length).toEqual(1);
});
it('triggers "fileActionsReady" event after update', function() {
var handler = sinon.stub();
- FileList.$fileList.on('fileActionsReady', handler);
- FileList.setFiles(testFiles);
+ fileList.$fileList.on('fileActionsReady', handler);
+ fileList.setFiles(testFiles);
expect(handler.calledOnce).toEqual(true);
});
it('triggers "updated" event after update', function() {
var handler = sinon.stub();
- FileList.$fileList.on('updated', handler);
- FileList.setFiles(testFiles);
+ fileList.$fileList.on('updated', handler);
+ fileList.setFiles(testFiles);
expect(handler.calledOnce).toEqual(true);
});
it('does not update summary when removing non-existing files', function() {
+ var $summary;
// single file
- FileList.setFiles([testFiles[0]]);
+ fileList.setFiles([testFiles[0]]);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
- FileList.remove('unexist.txt');
+ fileList.remove('unexist.txt');
expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
});
});
describe('Rendering next page on scroll', function() {
beforeEach(function() {
- FileList.setFiles(generateFiles(0, 64));
+ fileList.setFiles(generateFiles(0, 64));
});
it('renders only the first page', function() {
- expect(FileList.files.length).toEqual(65);
+ expect(fileList.files.length).toEqual(65);
expect($('#fileList tr').length).toEqual(20);
});
it('renders the second page when scrolling down (trigger nextPage)', function() {
// TODO: can't simulate scrolling here, so calling nextPage directly
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(40);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(60);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(65);
- FileList._nextPage(true);
+ fileList._nextPage(true);
// stays at 65
expect($('#fileList tr').length).toEqual(65);
});
it('inserts into the DOM if insertion point is in the visible page ', function() {
- FileList.add({
+ fileList.add({
id: 2000,
type: 'file',
name: 'File with index 15b.txt'
});
expect($('#fileList tr').length).toEqual(21);
- expect(FileList.findFileEl('File with index 15b.txt').index()).toEqual(16);
+ expect(fileList.findFileEl('File with index 15b.txt').index()).toEqual(16);
});
it('does not inserts into the DOM if insertion point is not the visible page ', function() {
- FileList.add({
+ fileList.add({
id: 2000,
type: 'file',
name: 'File with index 28b.txt'
});
expect($('#fileList tr').length).toEqual(20);
- expect(FileList.findFileEl('File with index 28b.txt').length).toEqual(0);
- FileList._nextPage(true);
+ expect(fileList.findFileEl('File with index 28b.txt').length).toEqual(0);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(40);
- expect(FileList.findFileEl('File with index 28b.txt').index()).toEqual(29);
+ expect(fileList.findFileEl('File with index 28b.txt').index()).toEqual(29);
});
it('appends into the DOM when inserting a file after the last visible element', function() {
- FileList.add({
+ fileList.add({
id: 2000,
type: 'file',
name: 'File with index 19b.txt'
});
expect($('#fileList tr').length).toEqual(21);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(41);
});
it('appends into the DOM when inserting a file on the last page when visible', function() {
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(40);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(60);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(65);
- FileList._nextPage(true);
- FileList.add({
+ fileList._nextPage(true);
+ fileList.add({
id: 2000,
type: 'file',
name: 'File with index 88.txt'
});
expect($('#fileList tr').length).toEqual(66);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(66);
});
it('shows additional page when appending a page of files and scrolling down', function() {
var newFiles = generateFiles(66, 81);
for (var i = 0; i < newFiles.length; i++) {
- FileList.add(newFiles[i]);
+ fileList.add(newFiles[i]);
}
expect($('#fileList tr').length).toEqual(20);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(40);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(60);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(80);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(81);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(81);
});
it('automatically renders next page when there are not enough elements visible', function() {
// delete the 15 first elements
for (var i = 0; i < 15; i++) {
- FileList.remove(FileList.files[0].name);
+ fileList.remove(fileList.files[0].name);
}
// still makes sure that there are 20 elements visible, if any
expect($('#fileList tr').length).toEqual(25);
@@ -834,7 +879,7 @@ describe('FileList tests', function() {
}
beforeEach(function() {
- previewLoadStub = sinon.stub(Files, 'lazyLoadPreview');
+ previewLoadStub = sinon.stub(OCA.Files.FileList.prototype, 'lazyLoadPreview');
});
afterEach(function() {
previewLoadStub.restore();
@@ -844,7 +889,7 @@ describe('FileList tests', function() {
type: 'file',
name: 'testFile.txt'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
var $td = $tr.find('td.filename');
expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/file.svg');
expect(previewLoadStub.notCalled).toEqual(true);
@@ -854,7 +899,7 @@ describe('FileList tests', function() {
type: 'dir',
name: 'test dir'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
var $td = $tr.find('td.filename');
expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/folder.svg');
expect(previewLoadStub.notCalled).toEqual(true);
@@ -865,7 +910,7 @@ describe('FileList tests', function() {
name: 'test dir',
icon: OC.webroot + '/core/img/filetypes/application-pdf.svg'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
var $td = $tr.find('td.filename');
expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/application-pdf.svg');
expect(previewLoadStub.notCalled).toEqual(true);
@@ -876,12 +921,12 @@ describe('FileList tests', function() {
name: 'test dir',
isPreviewAvailable: true
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
var $td = $tr.find('td.filename');
expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/file.svg');
expect(previewLoadStub.calledOnce).toEqual(true);
// third argument is callback
- previewLoadStub.getCall(0).args[2](OC.webroot + '/somepath.png');
+ previewLoadStub.getCall(0).args[0].callback(OC.webroot + '/somepath.png');
expect(getImageUrl($td)).toEqual(OC.webroot + '/somepath.png');
});
it('renders default file type icon when no icon was provided and no preview is available', function() {
@@ -890,7 +935,7 @@ describe('FileList tests', function() {
name: 'test dir',
isPreviewAvailable: false
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
var $td = $tr.find('td.filename');
expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/file.svg');
expect(previewLoadStub.notCalled).toEqual(true);
@@ -898,26 +943,38 @@ describe('FileList tests', function() {
});
describe('viewer mode', function() {
it('enabling viewer mode hides files table and action buttons', function() {
- FileList.setViewerMode(true);
+ fileList.setViewerMode(true);
expect($('#filestable').hasClass('hidden')).toEqual(true);
expect($('.actions').hasClass('hidden')).toEqual(true);
expect($('.notCreatable').hasClass('hidden')).toEqual(true);
});
it('disabling viewer mode restores files table and action buttons', function() {
- FileList.setViewerMode(true);
- FileList.setViewerMode(false);
+ fileList.setViewerMode(true);
+ fileList.setViewerMode(false);
expect($('#filestable').hasClass('hidden')).toEqual(false);
expect($('.actions').hasClass('hidden')).toEqual(false);
expect($('.notCreatable').hasClass('hidden')).toEqual(true);
});
it('disabling viewer mode restores files table and action buttons with correct permissions', function() {
$('#permissions').val(0);
- FileList.setViewerMode(true);
- FileList.setViewerMode(false);
+ fileList.setViewerMode(true);
+ fileList.setViewerMode(false);
expect($('#filestable').hasClass('hidden')).toEqual(false);
expect($('.actions').hasClass('hidden')).toEqual(true);
expect($('.notCreatable').hasClass('hidden')).toEqual(false);
});
+ it('toggling viewer mode triggers event', function() {
+ var handler = sinon.stub();
+ fileList.$el.on('changeViewerMode', handler);
+ fileList.setViewerMode(true);
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].viewerModeEnabled).toEqual(true);
+
+ handler.reset();
+ fileList.setViewerMode(false);
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].viewerModeEnabled).toEqual(false);
+ });
});
describe('loading file list', function() {
beforeEach(function() {
@@ -936,22 +993,22 @@ describe('FileList tests', function() {
]);
});
it('fetches file list from server and renders it when reload() is called', function() {
- FileList.reload();
+ fileList.reload();
expect(fakeServer.requests.length).toEqual(1);
var url = fakeServer.requests[0].url;
var query = url.substr(url.indexOf('?') + 1);
- expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir'});
+ expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir', sort: 'name', sortdirection: 'asc'});
fakeServer.respond();
expect($('#fileList tr').length).toEqual(4);
- expect(FileList.findFileEl('One.txt').length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').length).toEqual(1);
});
it('switches dir and fetches file list when calling changeDirectory()', function() {
- FileList.changeDirectory('/anothersubdir');
- expect(FileList.getCurrentDirectory()).toEqual('/anothersubdir');
+ fileList.changeDirectory('/anothersubdir');
+ expect(fileList.getCurrentDirectory()).toEqual('/anothersubdir');
expect(fakeServer.requests.length).toEqual(1);
var url = fakeServer.requests[0].url;
var query = url.substr(url.indexOf('?') + 1);
- expect(OC.parseQueryString(query)).toEqual({'dir': '/anothersubdir'});
+ expect(OC.parseQueryString(query)).toEqual({'dir': '/anothersubdir', sort: 'name', sortdirection: 'asc'});
fakeServer.respond();
});
it('switches to root dir when current directory does not exist', function() {
@@ -961,14 +1018,14 @@ describe('FileList tests', function() {
},
''
]);
- FileList.changeDirectory('/unexist');
+ fileList.changeDirectory('/unexist');
fakeServer.respond();
- expect(FileList.getCurrentDirectory()).toEqual('/');
+ expect(fileList.getCurrentDirectory()).toEqual('/');
});
it('shows mask before loading file list then hides it at the end', function() {
- var showMaskStub = sinon.stub(FileList, 'showMask');
- var hideMaskStub = sinon.stub(FileList, 'hideMask');
- FileList.changeDirectory('/anothersubdir');
+ var showMaskStub = sinon.stub(fileList, 'showMask');
+ var hideMaskStub = sinon.stub(fileList, 'hideMask');
+ fileList.changeDirectory('/anothersubdir');
expect(showMaskStub.calledOnce).toEqual(true);
expect(hideMaskStub.calledOnce).toEqual(false);
fakeServer.respond();
@@ -977,18 +1034,23 @@ describe('FileList tests', function() {
showMaskStub.restore();
hideMaskStub.restore();
});
- it('changes URL to target dir', function() {
- FileList.changeDirectory('/somedir');
- expect(pushStateStub.calledOnce).toEqual(true);
- expect(pushStateStub.getCall(0).args[0]).toEqual({dir: '/somedir'});
- expect(pushStateStub.getCall(0).args[2]).toEqual(OC.webroot + '/index.php/apps/files?dir=/somedir');
+ it('triggers "changeDirectory" event when changing directory', function() {
+ var handler = sinon.stub();
+ $('#app-content-files').on('changeDirectory', handler);
+ fileList.changeDirectory('/somedir');
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].dir).toEqual('/somedir');
+ });
+ it('changes the directory when receiving "urlChanged" event', function() {
+ $('#app-content-files').trigger(new $.Event('urlChanged', {view: 'files', dir: '/somedir'}));
+ expect(fileList.getCurrentDirectory()).toEqual('/somedir');
});
it('refreshes breadcrumb after update', function() {
- var setDirSpy = sinon.spy(FileList.breadcrumb, 'setDirectory');
- FileList.changeDirectory('/anothersubdir');
+ var setDirSpy = sinon.spy(fileList.breadcrumb, 'setDirectory');
+ fileList.changeDirectory('/anothersubdir');
fakeServer.respond();
- expect(FileList.breadcrumb.setDirectory.calledOnce).toEqual(true);
- expect(FileList.breadcrumb.setDirectory.calledWith('/anothersubdir')).toEqual(true);
+ expect(fileList.breadcrumb.setDirectory.calledOnce).toEqual(true);
+ expect(fileList.breadcrumb.setDirectory.calledWith('/anothersubdir')).toEqual(true);
setDirSpy.restore();
});
});
@@ -1009,20 +1071,20 @@ describe('FileList tests', function() {
]);
});
it('clicking on root breadcrumb changes directory to root', function() {
- FileList.changeDirectory('/subdir/two/three with space/four/five');
+ fileList.changeDirectory('/subdir/two/three with space/four/five');
fakeServer.respond();
- var changeDirStub = sinon.stub(FileList, 'changeDirectory');
- FileList.breadcrumb.$el.find('.crumb:eq(0)').click();
+ var changeDirStub = sinon.stub(fileList, 'changeDirectory');
+ fileList.breadcrumb.$el.find('.crumb:eq(0)').click();
expect(changeDirStub.calledOnce).toEqual(true);
expect(changeDirStub.getCall(0).args[0]).toEqual('/');
changeDirStub.restore();
});
it('clicking on breadcrumb changes directory', function() {
- FileList.changeDirectory('/subdir/two/three with space/four/five');
+ fileList.changeDirectory('/subdir/two/three with space/four/five');
fakeServer.respond();
- var changeDirStub = sinon.stub(FileList, 'changeDirectory');
- FileList.breadcrumb.$el.find('.crumb:eq(3)').click();
+ var changeDirStub = sinon.stub(fileList, 'changeDirectory');
+ fileList.breadcrumb.$el.find('.crumb:eq(3)').click();
expect(changeDirStub.calledOnce).toEqual(true);
expect(changeDirStub.getCall(0).args[0]).toEqual('/subdir/two/three with space');
@@ -1030,9 +1092,9 @@ describe('FileList tests', function() {
});
it('dropping files on breadcrumb calls move operation', function() {
var request, query, testDir = '/subdir/two/three with space/four/five';
- FileList.changeDirectory(testDir);
+ fileList.changeDirectory(testDir);
fakeServer.respond();
- var $crumb = FileList.breadcrumb.$el.find('.crumb:eq(3)');
+ var $crumb = fileList.breadcrumb.$el.find('.crumb:eq(3)');
// no idea what this is but is required by the handler
var ui = {
helper: {
@@ -1045,7 +1107,7 @@ describe('FileList tests', function() {
$('
+
); ?>)
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 2193717f4b4ccaecb94d3c04b3bc574f5b133411..6d0ed434ef2e9bc89f734749a8128e1d06cbf4d0 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -113,11 +113,137 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$fileinfo = $this->view->getFileInfo($this->folder);
\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+ }
+
+ function testEnfoceLinkPassword() {
+
+ $appConfig = \OC::$server->getAppConfig();
+ $appConfig->setValue('core', 'shareapi_enforce_links_password', 'yes');
+
+ // don't allow to share link without a password
+ $_POST['path'] = $this->folder;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+
+
+ $result = Share\Api::createShare(array());
+ $this->assertFalse($result->succeeded());
+
+
+ // don't allow to share link without a empty password
+ $_POST['path'] = $this->folder;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+ $_POST['password'] = '';
+
+ $result = Share\Api::createShare(array());
+ $this->assertFalse($result->succeeded());
+
+ // share with password should succeed
+ $_POST['path'] = $this->folder;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+ $_POST['password'] = 'foo';
+
+ $result = Share\Api::createShare(array());
+ $this->assertTrue($result->succeeded());
+ $data = $result->getData();
+ // setting new password should succeed
+ $params = array();
+ $params['id'] = $data['id'];
+ $params['_put'] = array();
+ $params['_put']['password'] = 'bar';
+ $result = Share\Api::updateShare($params);
+ $this->assertTrue($result->succeeded());
+
+ // removing password should fail
+ $params = array();
+ $params['id'] = $data['id'];
+ $params['_put'] = array();
+ $params['_put']['password'] = '';
+
+ $result = Share\Api::updateShare($params);
+ $this->assertFalse($result->succeeded());
+
+ // cleanup
+ $fileinfo = $this->view->getFileInfo($this->folder);
+ \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+ $appConfig->setValue('core', 'shareapi_enforce_links_password', 'no');
}
+ /**
+ * @medium
+ */
+ function testSharePermissions() {
+
+ // sharing file to a user should work if shareapi_exclude_groups is set
+ // to no
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
+ $_POST['path'] = $this->filename;
+ $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+ $result = Share\Api::createShare(array());
+
+ $this->assertTrue($result->succeeded());
+ $data = $result->getData();
+
+ $share = $this->getShareFromId($data['id']);
+
+ $items = \OCP\Share::getItemShared('file', $share['item_source']);
+
+ $this->assertTrue(!empty($items));
+
+ $fileinfo = $this->view->getFileInfo($this->filename);
+
+ $result = \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+ $this->assertTrue($result);
+
+ // exclude groups, but not the group the user belongs to. Sharing should still work
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'yes');
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group1,group2');
+
+ $_POST['path'] = $this->filename;
+ $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+ $result = Share\Api::createShare(array());
+
+ $this->assertTrue($result->succeeded());
+ $data = $result->getData();
+
+ $share = $this->getShareFromId($data['id']);
+
+ $items = \OCP\Share::getItemShared('file', $share['item_source']);
+
+ $this->assertTrue(!empty($items));
+
+ $fileinfo = $this->view->getFileInfo($this->filename);
+
+ $result = \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+ $this->assertTrue($result);
+
+ // now we exclude the group the user belongs to ('group'), sharing should fail now
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group');
+
+ $_POST['path'] = $this->filename;
+ $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+ $result = Share\Api::createShare(array());
+
+ $this->assertFalse($result->succeeded());
+
+ // cleanup
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', '');
+ }
+
+
/**
* @medium
* @depends testCreateShare
@@ -133,7 +259,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result->succeeded());
- // test should return two shares created from testCreateShare()
+ // test should return two shares created from testCreateShare()
$this->assertTrue(count($result->getData()) === 1);
\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -160,7 +286,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result->succeeded());
- // test should return one share created from testCreateShare()
+ // test should return one share created from testCreateShare()
$this->assertTrue(count($result->getData()) === 2);
\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -287,7 +413,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result->succeeded());
- // test should return one share within $this->folder
+ // test should return one share within $this->folder
$this->assertTrue(count($result->getData()) === 1);
\OCP\Share::unshare('file', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -298,7 +424,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief share a folder, than reshare a file within the shared folder and check if we construct the correct path
+ * share a folder, than reshare a file within the shared folder and check if we construct the correct path
* @medium
*/
function testGetShareFromFolderReshares() {
@@ -363,7 +489,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief reshare a sub folder and check if we get the correct path
+ * reshare a sub folder and check if we get the correct path
* @medium
*/
function testGetShareFromSubFolderReShares() {
@@ -416,7 +542,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test re-re-share of folder if the path gets constructed correctly
+ * test re-re-share of folder if the path gets constructed correctly
* @medium
*/
function testGetShareFromFolderReReShares() {
@@ -484,7 +610,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test multiple shared folder if the path gets constructed correctly
+ * test multiple shared folder if the path gets constructed correctly
* @medium
*/
function testGetShareMultipleSharedFolder() {
@@ -567,7 +693,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test re-re-share of folder if the path gets constructed correctly
+ * test re-re-share of folder if the path gets constructed correctly
* @medium
*/
function testGetShareFromFileReReShares() {
@@ -644,7 +770,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$result = Share\Api::getShare($params);
$this->assertEquals(404, $result->getStatusCode());
- $meta = $result->getMeta();
+ $meta = $result->getMeta();
$this->assertEquals('share doesn\'t exist', $meta['message']);
}
@@ -701,7 +827,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$result = Share\Api::updateShare($params);
- $meta = $result->getMeta();
+ $meta = $result->getMeta();
$this->assertTrue($result->succeeded(), $meta['message']);
$items = \OCP\Share::getItemShared('file', $userShare['file_source']);
@@ -841,7 +967,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test unshare of a reshared file
+ * test unshare of a reshared file
*/
function testDeleteReshare() {
@@ -885,7 +1011,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief share a folder which contains a share mount point, should be forbidden
+ * share a folder which contains a share mount point, should be forbidden
*/
public function testShareFolderWithAMountPoint() {
// user 1 shares a folder with user2
@@ -1004,4 +1130,58 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
\OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
}
+
+ public function testDefaultExpireDate() {
+ \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+ \OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'yes');
+ \OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'yes');
+ \OC_Appconfig::setValue('core', 'shareapi_expire_after_n_days', '2');
+
+ // default expire date is set to 2 days
+ // the time when the share was created is set to 3 days in the past
+ // user defined expire date is set to +2 days from now on
+ // -> link should be already expired by the default expire date but the user
+ // share should still exists.
+ $now = time();
+ $dateFormat = 'Y-m-d H:i:s';
+ $shareCreated = $now - 3 * 24 * 60 * 60;
+ $expireDate = date($dateFormat, $now + 2 * 24 * 60 * 60);
+
+ $info = OC\Files\Filesystem::getFileInfo($this->filename);
+ $this->assertTrue($info instanceof \OC\Files\FileInfo);
+
+ $result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, null, \OCP\PERMISSION_READ);
+ $this->assertTrue(is_string($result));
+
+ $result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+ $this->assertTrue($result);
+
+ $result = \OCP\Share::setExpirationDate('file', $info->getId() , $expireDate);
+ $this->assertTrue($result);
+
+ //manipulate stime so that both shares are older then the default expire date
+ $statement = "UPDATE `*PREFIX*share` SET `stime` = ? WHERE `share_type` = ?";
+ $query = \OCP\DB::prepare($statement);
+ $result = $query->execute(array($shareCreated, \OCP\Share::SHARE_TYPE_LINK));
+ $this->assertSame(1, $result);
+ $statement = "UPDATE `*PREFIX*share` SET `stime` = ? WHERE `share_type` = ?";
+ $query = \OCP\DB::prepare($statement);
+ $result = $query->execute(array($shareCreated, \OCP\Share::SHARE_TYPE_USER));
+ $this->assertSame(1, $result);
+
+ // now the link share should expire because of enforced default expire date
+ // the user share should still exist
+ $result = \OCP\Share::getItemShared('file', $info->getId());
+ $this->assertTrue(is_array($result));
+ $this->assertSame(1, count($result));
+ $share = reset($result);
+ $this->assertSame(\OCP\Share::SHARE_TYPE_USER, $share['share_type']);
+
+ //cleanup
+ $result = \OCP\Share::unshare('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+ $this->assertTrue($result);
+ \OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'no');
+ \OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'no');
+
+ }
}
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php
index 495dca072c72759af0ce50a5a5630065031e4366..34ec4a36ede9ddbda9b25846fffe47c415028a66 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/base.php
@@ -39,7 +39,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
public $filename;
public $data;
/**
- * @var OC_FilesystemView
+ * @var OC\Files\View
*/
public $view;
public $folder;
@@ -68,7 +68,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
$this->data = 'foobar';
- $this->view = new \OC_FilesystemView('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
+ $this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
// remember files_encryption state
$this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
@@ -97,7 +97,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
}
/**
- * @param $user
+ * @param string $user
* @param bool $create
* @param bool $password
*/
@@ -109,6 +109,8 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
if ($create) {
\OC_User::createUser($user, $password);
+ \OC_Group::createGroup('group');
+ \OC_Group::addToGroup($user, 'group');
}
\OC_Util::tearDownFS();
@@ -119,7 +121,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief get some information from a given share
+ * get some information from a given share
* @param int $shareID
* @return array with: item_source, share_type, share_with, item_type, permissions
*/
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 1af73c558d553c476f0386a536c5b18ee244141b..c5408ba55e7ceccb13fbd40505c960587cf71d1b 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -25,7 +25,7 @@ require_once __DIR__ . '/base.php';
class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
/**
- * @var OC_FilesystemView
+ * @var OC\Files\View
*/
public $user2View;
@@ -230,7 +230,7 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
}
/**
- * @brief verify if each value from the result matches the expected result
+ * verify if each value from the result matches the expected result
* @param array $example array with the expected results
* @param array $result array with the results
*/
diff --git a/apps/files_sharing/tests/proxy.php b/apps/files_sharing/tests/proxy.php
new file mode 100644
index 0000000000000000000000000000000000000000..634ed86db54d41ada1382cd81dee499877f0a4e2
--- /dev/null
+++ b/apps/files_sharing/tests/proxy.php
@@ -0,0 +1,98 @@
+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see AGPL
Bjoern Schiessle
true
- 4.9
+ 4.9
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 2193717f4b4ccaecb94d3c04b3bc574f5b133411..6d0ed434ef2e9bc89f734749a8128e1d06cbf4d0 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -113,11 +113,137 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$fileinfo = $this->view->getFileInfo($this->folder);
\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+ }
+
+ function testEnfoceLinkPassword() {
+
+ $appConfig = \OC::$server->getAppConfig();
+ $appConfig->setValue('core', 'shareapi_enforce_links_password', 'yes');
+
+ // don't allow to share link without a password
+ $_POST['path'] = $this->folder;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+
+
+ $result = Share\Api::createShare(array());
+ $this->assertFalse($result->succeeded());
+
+
+ // don't allow to share link without a empty password
+ $_POST['path'] = $this->folder;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+ $_POST['password'] = '';
+
+ $result = Share\Api::createShare(array());
+ $this->assertFalse($result->succeeded());
+
+ // share with password should succeed
+ $_POST['path'] = $this->folder;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+ $_POST['password'] = 'foo';
+
+ $result = Share\Api::createShare(array());
+ $this->assertTrue($result->succeeded());
+ $data = $result->getData();
+ // setting new password should succeed
+ $params = array();
+ $params['id'] = $data['id'];
+ $params['_put'] = array();
+ $params['_put']['password'] = 'bar';
+ $result = Share\Api::updateShare($params);
+ $this->assertTrue($result->succeeded());
+
+ // removing password should fail
+ $params = array();
+ $params['id'] = $data['id'];
+ $params['_put'] = array();
+ $params['_put']['password'] = '';
+
+ $result = Share\Api::updateShare($params);
+ $this->assertFalse($result->succeeded());
+
+ // cleanup
+ $fileinfo = $this->view->getFileInfo($this->folder);
+ \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+ $appConfig->setValue('core', 'shareapi_enforce_links_password', 'no');
}
+ /**
+ * @medium
+ */
+ function testSharePermissions() {
+
+ // sharing file to a user should work if shareapi_exclude_groups is set
+ // to no
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
+ $_POST['path'] = $this->filename;
+ $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+ $result = Share\Api::createShare(array());
+
+ $this->assertTrue($result->succeeded());
+ $data = $result->getData();
+
+ $share = $this->getShareFromId($data['id']);
+
+ $items = \OCP\Share::getItemShared('file', $share['item_source']);
+
+ $this->assertTrue(!empty($items));
+
+ $fileinfo = $this->view->getFileInfo($this->filename);
+
+ $result = \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+ $this->assertTrue($result);
+
+ // exclude groups, but not the group the user belongs to. Sharing should still work
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'yes');
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group1,group2');
+
+ $_POST['path'] = $this->filename;
+ $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+ $result = Share\Api::createShare(array());
+
+ $this->assertTrue($result->succeeded());
+ $data = $result->getData();
+
+ $share = $this->getShareFromId($data['id']);
+
+ $items = \OCP\Share::getItemShared('file', $share['item_source']);
+
+ $this->assertTrue(!empty($items));
+
+ $fileinfo = $this->view->getFileInfo($this->filename);
+
+ $result = \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+ $this->assertTrue($result);
+
+ // now we exclude the group the user belongs to ('group'), sharing should fail now
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group');
+
+ $_POST['path'] = $this->filename;
+ $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+ $result = Share\Api::createShare(array());
+
+ $this->assertFalse($result->succeeded());
+
+ // cleanup
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', '');
+ }
+
+
/**
* @medium
* @depends testCreateShare
@@ -133,7 +259,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result->succeeded());
- // test should return two shares created from testCreateShare()
+ // test should return two shares created from testCreateShare()
$this->assertTrue(count($result->getData()) === 1);
\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -160,7 +286,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result->succeeded());
- // test should return one share created from testCreateShare()
+ // test should return one share created from testCreateShare()
$this->assertTrue(count($result->getData()) === 2);
\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -287,7 +413,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result->succeeded());
- // test should return one share within $this->folder
+ // test should return one share within $this->folder
$this->assertTrue(count($result->getData()) === 1);
\OCP\Share::unshare('file', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -298,7 +424,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief share a folder, than reshare a file within the shared folder and check if we construct the correct path
+ * share a folder, than reshare a file within the shared folder and check if we construct the correct path
* @medium
*/
function testGetShareFromFolderReshares() {
@@ -363,7 +489,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief reshare a sub folder and check if we get the correct path
+ * reshare a sub folder and check if we get the correct path
* @medium
*/
function testGetShareFromSubFolderReShares() {
@@ -416,7 +542,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test re-re-share of folder if the path gets constructed correctly
+ * test re-re-share of folder if the path gets constructed correctly
* @medium
*/
function testGetShareFromFolderReReShares() {
@@ -484,7 +610,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test multiple shared folder if the path gets constructed correctly
+ * test multiple shared folder if the path gets constructed correctly
* @medium
*/
function testGetShareMultipleSharedFolder() {
@@ -567,7 +693,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test re-re-share of folder if the path gets constructed correctly
+ * test re-re-share of folder if the path gets constructed correctly
* @medium
*/
function testGetShareFromFileReReShares() {
@@ -644,7 +770,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$result = Share\Api::getShare($params);
$this->assertEquals(404, $result->getStatusCode());
- $meta = $result->getMeta();
+ $meta = $result->getMeta();
$this->assertEquals('share doesn\'t exist', $meta['message']);
}
@@ -701,7 +827,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$result = Share\Api::updateShare($params);
- $meta = $result->getMeta();
+ $meta = $result->getMeta();
$this->assertTrue($result->succeeded(), $meta['message']);
$items = \OCP\Share::getItemShared('file', $userShare['file_source']);
@@ -841,7 +967,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test unshare of a reshared file
+ * test unshare of a reshared file
*/
function testDeleteReshare() {
@@ -885,7 +1011,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief share a folder which contains a share mount point, should be forbidden
+ * share a folder which contains a share mount point, should be forbidden
*/
public function testShareFolderWithAMountPoint() {
// user 1 shares a folder with user2
@@ -1004,4 +1130,58 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
\OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
}
+
+ public function testDefaultExpireDate() {
+ \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+ \OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'yes');
+ \OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'yes');
+ \OC_Appconfig::setValue('core', 'shareapi_expire_after_n_days', '2');
+
+ // default expire date is set to 2 days
+ // the time when the share was created is set to 3 days in the past
+ // user defined expire date is set to +2 days from now on
+ // -> link should be already expired by the default expire date but the user
+ // share should still exists.
+ $now = time();
+ $dateFormat = 'Y-m-d H:i:s';
+ $shareCreated = $now - 3 * 24 * 60 * 60;
+ $expireDate = date($dateFormat, $now + 2 * 24 * 60 * 60);
+
+ $info = OC\Files\Filesystem::getFileInfo($this->filename);
+ $this->assertTrue($info instanceof \OC\Files\FileInfo);
+
+ $result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, null, \OCP\PERMISSION_READ);
+ $this->assertTrue(is_string($result));
+
+ $result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+ $this->assertTrue($result);
+
+ $result = \OCP\Share::setExpirationDate('file', $info->getId() , $expireDate);
+ $this->assertTrue($result);
+
+ //manipulate stime so that both shares are older then the default expire date
+ $statement = "UPDATE `*PREFIX*share` SET `stime` = ? WHERE `share_type` = ?";
+ $query = \OCP\DB::prepare($statement);
+ $result = $query->execute(array($shareCreated, \OCP\Share::SHARE_TYPE_LINK));
+ $this->assertSame(1, $result);
+ $statement = "UPDATE `*PREFIX*share` SET `stime` = ? WHERE `share_type` = ?";
+ $query = \OCP\DB::prepare($statement);
+ $result = $query->execute(array($shareCreated, \OCP\Share::SHARE_TYPE_USER));
+ $this->assertSame(1, $result);
+
+ // now the link share should expire because of enforced default expire date
+ // the user share should still exist
+ $result = \OCP\Share::getItemShared('file', $info->getId());
+ $this->assertTrue(is_array($result));
+ $this->assertSame(1, count($result));
+ $share = reset($result);
+ $this->assertSame(\OCP\Share::SHARE_TYPE_USER, $share['share_type']);
+
+ //cleanup
+ $result = \OCP\Share::unshare('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+ $this->assertTrue($result);
+ \OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'no');
+ \OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'no');
+
+ }
}
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php
index 495dca072c72759af0ce50a5a5630065031e4366..34ec4a36ede9ddbda9b25846fffe47c415028a66 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/base.php
@@ -39,7 +39,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
public $filename;
public $data;
/**
- * @var OC_FilesystemView
+ * @var OC\Files\View
*/
public $view;
public $folder;
@@ -68,7 +68,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
$this->data = 'foobar';
- $this->view = new \OC_FilesystemView('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
+ $this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
// remember files_encryption state
$this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
@@ -97,7 +97,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
}
/**
- * @param $user
+ * @param string $user
* @param bool $create
* @param bool $password
*/
@@ -109,6 +109,8 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
if ($create) {
\OC_User::createUser($user, $password);
+ \OC_Group::createGroup('group');
+ \OC_Group::addToGroup($user, 'group');
}
\OC_Util::tearDownFS();
@@ -119,7 +121,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief get some information from a given share
+ * get some information from a given share
* @param int $shareID
* @return array with: item_source, share_type, share_with, item_type, permissions
*/
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 1af73c558d553c476f0386a536c5b18ee244141b..c5408ba55e7ceccb13fbd40505c960587cf71d1b 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -25,7 +25,7 @@ require_once __DIR__ . '/base.php';
class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
/**
- * @var OC_FilesystemView
+ * @var OC\Files\View
*/
public $user2View;
@@ -230,7 +230,7 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
}
/**
- * @brief verify if each value from the result matches the expected result
+ * verify if each value from the result matches the expected result
* @param array $example array with the expected results
* @param array $result array with the results
*/
diff --git a/apps/files_sharing/tests/proxy.php b/apps/files_sharing/tests/proxy.php
new file mode 100644
index 0000000000000000000000000000000000000000..634ed86db54d41ada1382cd81dee499877f0a4e2
--- /dev/null
+++ b/apps/files_sharing/tests/proxy.php
@@ -0,0 +1,98 @@
+
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see t('Nothing in here. Your trash bin is empty!'))?>
-
-
-
+
); ?>)
t('Help'));?>
); ?>)
-