ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

return empty result

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-06-17 22:04:25 +02:00
parent 0f50f8d1d9
commit a83b50bb97
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.yml
View File

@@ -33,6 +33,7 @@ rules:
no-fallthrough: error no-fallthrough: error
no-mixed-spaces-and-tabs: error no-mixed-spaces-and-tabs: error
no-unused-vars: warn no-unused-vars: warn
no-useless-escape: warn
no-use-before-define: error no-use-before-define: error
semi: ["error", "always"] semi: ["error", "always"]
indent: indent:

2
js/controller/AttachmentController.js
View File

@@ -53,7 +53,7 @@ class AttachmentListController {
insertText = `![📎 ${filename}](${url})`; insertText = `![📎 ${filename}](${url})`;
} }
return insertText; return insertText;
}; }
select(attachment) { select(attachment) {
this.onSelect({attachment: this.getAttachmentMarkdown(attachment)}); this.onSelect({attachment: this.getAttachmentMarkdown(attachment)});

12
js/service/FileService.js
View File

@@ -42,14 +42,10 @@ export default class FileService {
{ {
requesttoken: oc_requesttoken, requesttoken: oc_requesttoken,
type: 'deck_file', type: 'deck_file',
} }
]; ];
} }
fileItem.headers = fileItem.headers = {requesttoken: oc_requesttoken};
{
requesttoken: oc_requesttoken,
};
this.uploader.uploadItem(fileItem); this.uploader.uploadItem(fileItem);
} }
@@ -75,7 +71,7 @@ export default class FileService {
return attachment.extendedData.info.extension === existingFile.extendedData.info.extension return attachment.extendedData.info.extension === existingFile.extendedData.info.extension
&& attachment.extendedData.info.filename.startsWith(fileName); && attachment.extendedData.info.filename.startsWith(fileName);
}); });
let nextIndex = foundFilesMatching.length+1; let nextIndex = foundFilesMatching.length + 1;
fileItem.file.name = fileName + ' (' + nextIndex + ').' + existingFile.extendedData.info.extension; fileItem.file.name = fileName + ' (' + nextIndex + ').' + existingFile.extendedData.info.extension;
self.runUpload(fileItem); self.runUpload(fileItem);
} }
@@ -90,14 +86,14 @@ export default class FileService {
} }
onSuccessItem(item, response) { onSuccessItem (item, response) {
let attachments = this.cardservice.get(item.cardId).attachments; let attachments = this.cardservice.get(item.cardId).attachments;
let index = attachments.indexOf(attachments.find((attachment) => attachment.id === response.id)); let index = attachments.indexOf(attachments.find((attachment) => attachment.id === response.id));
if (~index) { if (~index) {
attachments = attachments.splice(index, 1); attachments = attachments.splice(index, 1);
} }
this.cardservice.get(item.cardId).attachments.push(response); this.cardservice.get(item.cardId).attachments.push(response);
}; }
} }

2
lib/Service/FileService.php
View File

@@ -112,7 +112,7 @@ class FileService implements IAttachmentService {
]; ];
if (empty($file)) { if (empty($file)) {
$error = $this->l10n->t('No file uploaded'); $error = $this->l10n->t('No file uploaded');
} }
if (!empty($file) && array_key_exists('error', $file) && $file['error'] !== UPLOAD_ERR_OK) { if (!empty($file) && array_key_exists('error', $file) && $file['error'] !== UPLOAD_ERR_OK) {
$error = $phpFileUploadErrors[$file['error']]; $error = $phpFileUploadErrors[$file['error']];

8
tests/unit/Service/FileServiceTest.php
View File

@@ -86,7 +86,7 @@ class FileServiceTest extends TestCase {
private function mockGetUploadedFileEmpty() { private function mockGetUploadedFileEmpty() {
$this->request->expects($this->once()) $this->request->expects($this->once())
->method('getUploadedFile') ->method('getUploadedFile')
->willReturn(null); ->willReturn([]);
} }
private function mockGetUploadedFileError($error) { private function mockGetUploadedFileError($error) {
$this->request->expects($this->once()) $this->request->expects($this->once())
@@ -107,6 +107,9 @@ class FileServiceTest extends TestCase {
*/ */
public function testCreateEmpty() { public function testCreateEmpty() {
$attachment = $this->getAttachment(); $attachment = $this->getAttachment();
$this->l10n->expects($this->any())
->method('t')
->willReturn('Error');
$this->mockGetUploadedFileEmpty(); $this->mockGetUploadedFileEmpty();
$this->fileService->create($attachment); $this->fileService->create($attachment);
} }
@@ -117,6 +120,9 @@ class FileServiceTest extends TestCase {
public function testCreateError() { public function testCreateError() {
$attachment = $this->getAttachment(); $attachment = $this->getAttachment();
$this->mockGetUploadedFileError(UPLOAD_ERR_INI_SIZE); $this->mockGetUploadedFileError(UPLOAD_ERR_INI_SIZE);
$this->l10n->expects($this->any())
->method('t')
->willReturn('Error');
$this->fileService->create($attachment); $this->fileService->create($attachment);
} }