mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix trashbin js tests 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2018-09-26 19:20:53 +02:00
parent d890cd6a4c
commit c5f77de3e2
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
1 changed files with 141 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
apps/files_trashbin/tests/js/filelistSpec.js
View File

@ -20,12 +20,19 @@
*/ */
describe('OCA.Trashbin.FileList tests', function () { describe('OCA.Trashbin.FileList tests', function () {
var testFiles, alertStub, notificationStub, fileList; var testFiles, alertStub, notificationStub, fileList, client;
beforeEach(function () { beforeEach(function () {
alertStub = sinon.stub(OC.dialogs, 'alert'); alertStub = sinon.stub(OC.dialogs, 'alert');
notificationStub = sinon.stub(OC.Notification, 'show'); notificationStub = sinon.stub(OC.Notification, 'show');
client = new OC.Files.Client({
host: 'localhost',
port: 80,
root: '/remote.php/dav/trashbin/user',
useHTTPS: OC.getProtocol() === 'https'
});
// init parameters and test table elements // init parameters and test table elements
$('#testArea').append( $('#testArea').append(
'<div id="app-content-trashbin">' + '<div id="app-content-trashbin">' +
@ -59,21 +66,24 @@ describe('OCA.Trashbin.FileList tests', function() {
testFiles = [{ testFiles = [{
id: 1, id: 1,
type: 'file', type: 'file',
name: 'One.txt', name: 'One.txt.d11111',
displayName: 'One.txt',
mtime: 11111000, mtime: 11111000,
mimetype: 'text/plain', mimetype: 'text/plain',
etag: 'abc' etag: 'abc'
}, { }, {
id: 2, id: 2,
type: 'file', type: 'file',
name: 'Two.jpg', name: 'Two.jpg.d22222',
displayName: 'Two.jpg',
mtime: 22222000, mtime: 22222000,
mimetype: 'image/jpeg', mimetype: 'image/jpeg',
etag: 'def', etag: 'def',
}, { }, {
id: 3, id: 3,
type: 'file', type: 'file',
name: 'Three.pdf', name: 'Three.pdf.d33333',
displayName: 'Three.pdf',
mtime: 33333000, mtime: 33333000,
mimetype: 'application/pdf', mimetype: 'application/pdf',
etag: '123', etag: '123',
@ -81,7 +91,8 @@ describe('OCA.Trashbin.FileList tests', function() {
id: 4, id: 4,
type: 'dir', type: 'dir',
mtime: 99999000, mtime: 99999000,
name: 'somedir', name: 'somedir.d99999',
displayName: 'somedir',
mimetype: 'httpd/unix-directory', mimetype: 'httpd/unix-directory',
etag: '456' etag: '456'
}]; }];
@ -101,7 +112,8 @@ describe('OCA.Trashbin.FileList tests', function() {
displayName: t('files', 'Delete'), displayName: t('files', 'Delete'),
iconClass: 'icon-delete', iconClass: 'icon-delete',
} }
] ],
client: client
} }
); );
}); });
@ -200,7 +212,10 @@ describe('OCA.Trashbin.FileList tests', function() {
// dir listing is true when in a subdir // dir listing is true when in a subdir
$('#dir').val('/subdir'); $('#dir').val('/subdir');
fileList.setFiles(testFiles); fileList.setFiles(testFiles.map(function (file) {
file.name = file.displayName;
return file;
}));
var $rows = fileList.$el.find('tbody tr'); var $rows = fileList.$el.find('tbody tr');
var $tr = $rows.eq(0); var $tr = $rows.eq(0);
expect($rows.length).toEqual(4); expect($rows.length).toEqual(4);
@ -303,98 +318,81 @@ describe('OCA.Trashbin.FileList tests', function() {
}); });
it('Deletes selected files when "Delete" clicked', function () { it('Deletes selected files when "Delete" clicked', function () {
var request; var request;
var $deleteLink = $('.selectedActions .filesSelectMenu .delete'); var promise = fileList._onClickDeleteSelected({
$deleteLink.click(); preventDefault: function () {
expect($deleteLink.find('.icon-loading-small').length).toEqual(1);
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/delete.php');
expect(OC.parseQueryString(request.requestBody))
.toEqual({'dir': '/', files: '["One.txt.d11111","Three.pdf.d33333","somedir.d99999"]'});
fakeServer.requests[0].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({
status: 'success',
data: {
success: [
{filename: 'One.txt.d11111'},
{filename: 'Three.pdf.d33333'},
{filename: 'somedir.d99999'}
]
} }
}) });
); var files = ["One.txt.d11111", "Three.pdf.d33333", "somedir.d99999"];
expect($deleteLink.find('.icon-loading-small').length).toEqual(0); expect(fakeServer.requests.length).toEqual(files.length);
for (var i = 0; i < files.length; i++) {
request = fakeServer.requests[i];
expect(request.url).toEqual(OC.webroot + '/remote.php/dav/trashbin/user/trash/' + files[i]);
request.respond(200);
}
return promise.then(function () {
expect(fileList.findFileEl('One.txt.d11111').length).toEqual(0); expect(fileList.findFileEl('One.txt.d11111').length).toEqual(0);
expect(fileList.findFileEl('Three.pdf.d33333').length).toEqual(0); expect(fileList.findFileEl('Three.pdf.d33333').length).toEqual(0);
expect(fileList.findFileEl('somedir.d99999').length).toEqual(0); expect(fileList.findFileEl('somedir.d99999').length).toEqual(0);
expect(fileList.findFileEl('Two.jpg.d22222').length).toEqual(1); expect(fileList.findFileEl('Two.jpg.d22222').length).toEqual(1);
}); });
});
it('Deletes all files when all selected when "Delete" clicked', function () { it('Deletes all files when all selected when "Delete" clicked', function () {
var request; var request;
$('.select-all').click(); $('.select-all').click();
$('.selectedActions .filesSelectMenu .delete').click(); var promise = fileList._onClickDeleteSelected({
preventDefault: function () {
}
});
expect(fakeServer.requests.length).toEqual(1); expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0]; request = fakeServer.requests[0];
expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/delete.php'); expect(request.url).toEqual(OC.webroot + '/remote.php/dav/trashbin/user/trash');
expect(OC.parseQueryString(request.requestBody)) request.respond(200);
.toEqual({'dir': '/', allfiles: 'true'}); return promise.then(function () {
fakeServer.requests[0].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({status: 'success'})
);
expect(fileList.isEmpty).toEqual(true); expect(fileList.isEmpty).toEqual(true);
}); });
}); });
});
describe('Restore', function () { describe('Restore', function () {
it('Restores selected files when "Restore" clicked', function () { it('Restores selected files when "Restore" clicked', function () {
var request; var request;
var $restoreLink = $('.selectedActions .filesSelectMenu .restore'); var promise = fileList._onClickRestoreSelected({
$restoreLink.click(); preventDefault: function () {
expect($restoreLink.find('.icon-loading-small').length).toEqual(1);
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/undelete.php');
expect(OC.parseQueryString(request.requestBody))
.toEqual({'dir': '/', files: '["One.txt.d11111","Three.pdf.d33333","somedir.d99999"]'});
fakeServer.requests[0].respond(
200,
{ 'Content-Type': 'application/json' },
JSON.stringify({
status: 'success',
data: {
success: [
{filename: 'One.txt.d11111'},
{filename: 'Three.pdf.d33333'},
{filename: 'somedir.d99999'}
]
} }
}) });
); var files = ["One.txt.d11111", "Three.pdf.d33333", "somedir.d99999"];
expect($restoreLink.find('.icon-loading-small').length).toEqual(0); expect(fakeServer.requests.length).toEqual(files.length);
for (var i = 0; i < files.length; i++) {
request = fakeServer.requests[i];
expect(request.url).toEqual(OC.webroot + '/remote.php/dav/trashbin/user/trash/' + files[i]);
expect(request.requestHeaders.Destination).toEqual(OC.webroot + '/remote.php/dav/trashbin/user/restore/' + files[i]);
request.respond(200);
}
return promise.then(function() {
expect(fileList.findFileEl('One.txt.d11111').length).toEqual(0); expect(fileList.findFileEl('One.txt.d11111').length).toEqual(0);
expect(fileList.findFileEl('Three.pdf.d33333').length).toEqual(0); expect(fileList.findFileEl('Three.pdf.d33333').length).toEqual(0);
expect(fileList.findFileEl('somedir.d99999').length).toEqual(0); expect(fileList.findFileEl('somedir.d99999').length).toEqual(0);
expect(fileList.findFileEl('Two.jpg.d22222').length).toEqual(1); expect(fileList.findFileEl('Two.jpg.d22222').length).toEqual(1);
}); });
});
it('Restores all files when all selected when "Restore" clicked', function () { it('Restores all files when all selected when "Restore" clicked', function () {
var request; var request;
$('.select-all').click(); $('.select-all').click();
$('.selectedActions .filesSelectMenu .restore').click(); var promise = fileList._onClickRestoreSelected({
expect(fakeServer.requests.length).toEqual(1); preventDefault: function () {
request = fakeServer.requests[0]; }
expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/undelete.php'); });
expect(OC.parseQueryString(request.requestBody)) var files = ["One.txt.d11111", "Two.jpg.d22222", "Three.pdf.d33333", "somedir.d99999"];
.toEqual({'dir': '/', allfiles: 'true'}); expect(fakeServer.requests.length).toEqual(files.length);
fakeServer.requests[0].respond( for (var i = 0; i < files.length; i++) {
200, request = fakeServer.requests[i];
{ 'Content-Type': 'application/json' }, expect(request.url).toEqual(OC.webroot + '/remote.php/dav/trashbin/user/trash/' + files[i]);
JSON.stringify({status: 'success'}) expect(request.requestHeaders.Destination).toEqual(OC.webroot + '/remote.php/dav/trashbin/user/restore/' + files[i]);
); request.respond(200);
}
return promise.then(function() {
expect(fileList.isEmpty).toEqual(true); expect(fileList.isEmpty).toEqual(true);
}); });
}); });
}); });
}); });
});