From 07483033c1b52efd269a0b1eb8df1d3eb2ad8a2b Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 19 May 2015 15:12:08 +0200 Subject: [PATCH 1/2] Fix URL generation `params` in the `OC.generateUrl` function call only replaces all specified occurences of a key just like the l10n PHP functionality does. This means that to build a query string we have to use `OC.buildQueryString` instead of the params parameters. Fixes https://github.com/owncloud/core/issues/16336 which is a regression introduced with https://github.com/owncloud/core/commit/58a87d0babcb91aab75b45e630d2fc2fee15691e of https://github.com/owncloud/core/pull/15652. Without this fix downloading single files from a public shared folder is not possible. --- apps/files_sharing/js/public.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 79bd0bb0c4..73b76b6baf 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -144,7 +144,7 @@ OCA.Sharing.PublicApp = { path: path, files: filename }; - return OC.generateUrl('/s/' + token + '/download', params); + return OC.generateUrl('/s/' + token + '/download') + '?' + OC.buildQueryString(params); }; this.fileList.getAjaxUrl = function (action, params) { From f7a2b5e7a948f9bd8e5fcf5b642afad3fa84ae5d Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 19 May 2015 17:40:36 +0200 Subject: [PATCH 2/2] Added unit tests for download URL in public sharing page --- apps/files_sharing/js/public.js | 5 + apps/files_sharing/tests/js/publicAppSpec.js | 107 +++++++++++++++++++ tests/karma.config.js | 3 +- 3 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 apps/files_sharing/tests/js/publicAppSpec.js diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 73b76b6baf..c5934a4f60 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -277,6 +277,11 @@ OCA.Sharing.PublicApp = { }; $(document).ready(function () { + // FIXME: replace with OC.Plugins.register() + if (window.TESTING) { + return; + } + var App = OCA.Sharing.PublicApp; // defer app init, to give a chance to plugins to register file actions _.defer(function () { diff --git a/apps/files_sharing/tests/js/publicAppSpec.js b/apps/files_sharing/tests/js/publicAppSpec.js new file mode 100644 index 0000000000..d496b78acf --- /dev/null +++ b/apps/files_sharing/tests/js/publicAppSpec.js @@ -0,0 +1,107 @@ +/** +* ownCloud +* +* @author Vincent Petry +* @copyright 2015 Vincent Petry +* +* 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 . +* +*/ + +describe('OCA.Sharing.PublicApp tests', function() { + var App = OCA.Sharing.PublicApp; + var $preview; + var fileListIn; + var fileListOut; + + beforeEach(function() { + $preview = $('
'); + $('#testArea').append($preview); + $preview.append( + '
' + + '
' + + '' + ); + }); + + describe('File list', function() { + // TODO: this should be moved to a separate file once the PublicFileList is extracted from public.js + beforeEach(function() { + $preview.append( + '
' + + // init horrible parameters + '' + + '' + + // dummy controls + '
' + + '
' + + '
' + + '
' + + // uploader + '' + + // dummy table + // TODO: at some point this will be rendered by the fileList class itself! + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
' + + // TODO: move to handlebars template + '

Empty content message

Upload message

' + + '' + + '
' + ); + + App.initialize($('#preview')); + }); + afterEach(function() { + App._initialized = false; + }); + + describe('Download Url', function() { + var fileList; + + beforeEach(function() { + fileList = App.fileList; + }); + + it('returns correct download URL for single files', function() { + expect(fileList.getDownloadUrl('some file.txt')) + .toEqual(OC.webroot + '/index.php/s/sh4tok/download?path=%2Fsubdir&files=some%20file.txt'); + expect(fileList.getDownloadUrl('some file.txt', '/anotherpath/abc')) + .toEqual(OC.webroot + '/index.php/s/sh4tok/download?path=%2Fanotherpath%2Fabc&files=some%20file.txt'); + fileList.changeDirectory('/'); + expect(fileList.getDownloadUrl('some file.txt')) + .toEqual(OC.webroot + '/index.php/s/sh4tok/download?path=%2F&files=some%20file.txt'); + }); + it('returns correct download URL for multiple files', function() { + expect(fileList.getDownloadUrl(['a b c.txt', 'd e f.txt'])) + .toEqual(OC.webroot + '/index.php/s/sh4tok/download?path=%2Fsubdir&files=%5B%22a%20b%20c.txt%22%2C%22d%20e%20f.txt%22%5D'); + }); + it('returns the correct ajax URL', function() { + expect(fileList.getAjaxUrl('test', {a:1, b:'x y'})) + .toEqual(OC.webroot + '/index.php/apps/files_sharing/ajax/test.php?a=1&b=x%20y&t=sh4tok'); + }); + }); + }); +}); diff --git a/tests/karma.config.js b/tests/karma.config.js index 997da4bcb2..8aeadc123e 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -54,7 +54,8 @@ module.exports = function(config) { 'apps/files_sharing/js/app.js', 'apps/files_sharing/js/sharedfilelist.js', 'apps/files_sharing/js/share.js', - 'apps/files_sharing/js/external.js' + 'apps/files_sharing/js/external.js', + 'apps/files_sharing/js/public.js' ], testFiles: ['apps/files_sharing/tests/js/*.js'] },