diff options
| author | Tomasz Grobelny <tomasz@grobelny.net> | 2019-01-29 21:26:44 +0100 |
|---|---|---|
| committer | Tomasz Grobelny <tomasz@grobelny.net> | 2019-01-29 21:26:44 +0100 |
| commit | 08919eb19335825dc1f2cd950f9529a2b9caf29b (patch) | |
| tree | b8b0feecbac68789b0f89526c19f1c64523e2544 /apps/files/tests/js | |
| parent | 04d326f95feacd640dc5d6fecff1ec0ef0970265 (diff) | |
| parent | deb7d2364f38ce24bee62cd490fccfd6e4d3f059 (diff) | |
| download | nextcloud-server-08919eb19335825dc1f2cd950f9529a2b9caf29b.tar.gz nextcloud-server-08919eb19335825dc1f2cd950f9529a2b9caf29b.zip | |
Merge branch 'master' into operation_progress_improvements3
Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
Diffstat (limited to 'apps/files/tests/js')
| -rw-r--r-- | apps/files/tests/js/fileUploadSpec.js | 3 |
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], |