Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Grobelny <tomasz@grobelny.net>2019-01-29 23:26:44 +0300
committerTomasz Grobelny <tomasz@grobelny.net>2019-01-29 23:26:44 +0300
commit08919eb19335825dc1f2cd950f9529a2b9caf29b (patch)
treeb8b0feecbac68789b0f89526c19f1c64523e2544 /apps/files/tests
parent04d326f95feacd640dc5d6fecff1ec0ef0970265 (diff)
parentdeb7d2364f38ce24bee62cd490fccfd6e4d3f059 (diff)
Merge branch 'master' into operation_progress_improvements3
Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
Diffstat (limited to 'apps/files/tests')
-rw-r--r--apps/files/tests/js/fileUploadSpec.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
index 6fe3907c1ec..0d2c9eb0697 100644
--- a/apps/files/tests/js/fileUploadSpec.js
+++ b/apps/files/tests/js/fileUploadSpec.js
@@ -69,7 +69,8 @@ describe('OC.Upload tests', function() {
files: [file],
jqXHR: jqXHR,
response: sinon.stub().returns(jqXHR),
- submit: sinon.stub()
+ submit: sinon.stub(),
+ abort: sinon.stub()
};
if (uploader.fileUploadParam.add.call(
$dummyUploader[0],