This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-fauxton.git
The following commit(s) were added to refs/heads/master by this push:
new f9e3682 Encode filename for file uploads (#1003)
f9e3682 is described below
commit f9e36820a85a242fe0da55d54887c2d868d7fabf
Author: Antonio Maranhao <[email protected]>
AuthorDate: Tue Oct 24 14:36:42 2017 -0400
Encode filename for file uploads (#1003)
---
.../__tests__/doc-editor.actions.test.js | 57 ++++++++++++++++++++++
app/addons/documents/doc-editor/actions.js | 2 +-
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git
a/app/addons/documents/doc-editor/__tests__/doc-editor.actions.test.js
b/app/addons/documents/doc-editor/__tests__/doc-editor.actions.test.js
new file mode 100644
index 0000000..85527f0
--- /dev/null
+++ b/app/addons/documents/doc-editor/__tests__/doc-editor.actions.test.js
@@ -0,0 +1,57 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy
of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
under
+// the License.
+
+import FauxtonAPI from "../../../../core/api";
+import Actions from "../actions";
+import Documents from "../../resources";
+import Databases from "../../../databases/base";
+import utils from "../../../../../test/mocha/testUtils";
+import sinon from "sinon";
+
+const { restore } = utils;
+
+describe('DocEditorActions', () => {
+ const database = new Databases.Model({ id: 'db1' });
+ const doc = new Documents.Doc({ _id: 'foo' }, { database: database });
+
+ afterEach(() => {
+ restore(FauxtonAPI.addNotification);
+ restore(FauxtonAPI.navigate);
+ restore(FauxtonAPI.urls);
+ });
+
+ it('uploadAttachment handles filenames with special chars', () => {
+ sinon.stub(FauxtonAPI, 'addNotification');
+ sinon.stub(FauxtonAPI, 'urls').callsFake((p1, p2, p3, p4, p5, p6) => {
+ return [p1, p2, p3, p4, p5, p6].join('/');
+ });
+ const stub = sinon.stub($, 'ajax');
+ const params = {
+ rev: 'rev-num',
+ doc: doc,
+ files: [
+ {
+ name: 'file-#?&-123.txt',
+ length: 100
+ }
+ ]
+ };
+
+ Actions.uploadAttachment(params);
+ sinon.assert.calledWithMatch(stub,
+ {
+ url: 'document/attachment/db1/foo/' +
encodeURIComponent(params.files[0].name) + '/?rev=rev-num'
+ }
+ );
+ });
+
+});
diff --git a/app/addons/documents/doc-editor/actions.js
b/app/addons/documents/doc-editor/actions.js
index 7fda0df..e66d5cd 100644
--- a/app/addons/documents/doc-editor/actions.js
+++ b/app/addons/documents/doc-editor/actions.js
@@ -169,7 +169,7 @@ function uploadAttachment (params) {
var file = params.files[0];
$.ajax({
- url: FauxtonAPI.urls('document', 'attachment', db, docId, file.name,
query),
+ url: FauxtonAPI.urls('document', 'attachment', db, docId,
encodeURIComponent(file.name), query),
type: 'PUT',
data: file,
contentType: file.type,
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
