diff --git a/packages/@uppy/companion/src/server/Uploader.js b/packages/@uppy/companion/src/server/Uploader.js index 32b8186a4a..318d513f7c 100644 --- a/packages/@uppy/companion/src/server/Uploader.js +++ b/packages/@uppy/companion/src/server/Uploader.js @@ -437,11 +437,6 @@ class Uploader { * start the tus upload */ uploadTus () { - if (!this.failed) { - this.failed = true - setTimeout(() => this.emitError(new Error('test')), 1000) - return - } const file = fs.createReadStream(this.path) const uploader = this diff --git a/packages/@uppy/tus/package.json b/packages/@uppy/tus/package.json index 161d76cb7f..4a6bd7575e 100644 --- a/packages/@uppy/tus/package.json +++ b/packages/@uppy/tus/package.json @@ -28,8 +28,5 @@ }, "peerDependencies": { "@uppy/core": "^2.0.0" - }, - "devDependencies": { - "nock": "^13.1.4" } } diff --git a/packages/@uppy/tus/src/index.js b/packages/@uppy/tus/src/index.js index 5a242a8041..0b00c3d6a8 100644 --- a/packages/@uppy/tus/src/index.js +++ b/packages/@uppy/tus/src/index.js @@ -366,7 +366,7 @@ module.exports = class Tus extends BasePlugin { this.uppy.emit('upload-started', file) this.uppy.log(file.remote.url) - if (file.serverToken && file.response) { + if (file.serverToken) { return this.connectToServerSocket(file) } diff --git a/packages/@uppy/tus/src/index.test.js b/packages/@uppy/tus/src/index.test.js index f0149d0dec..2be713cf28 100644 --- a/packages/@uppy/tus/src/index.test.js +++ b/packages/@uppy/tus/src/index.test.js @@ -1,38 +1,28 @@ const Core = require('@uppy/core') -const nock = require('nock') - const Tus = require('.') -const KB = 1024 - describe('Tus', () => { - it('Throws errors if autoRetry option is passed', () => { + it('Throws errors if autoRetry option is true', () => { const uppy = new Core() - const errorMsg = /The `autoRetry` option was deprecated and has been removed/ - expect(() => uppy.use(Tus, { autoRetry: true })).toThrowError(errorMsg) - expect(() => uppy.use(Tus, { autoRetry: false })).toThrowError(errorMsg) - expect(() => uppy.use(Tus, { autoRetry: undefined })).toThrowError(errorMsg) + expect(() => { + uppy.use(Tus, { autoRetry: true }) + }).toThrowError(/The `autoRetry` option was deprecated and has been removed/) }) - it('should do POST request again when retrying', async () => { + it('Throws errors if autoRetry option is false', () => { const uppy = new Core() - const endpoint = 'https://tusd.tusdemo.net/files/' - const scope = nock(endpoint) - - scope.post('/').reply(201) - uppy.use(Tus, { endpoint }) - uppy.addFile({ - source: 'jest', - name: 'foo1.jpg', - type: 'image/jpeg', - data: new File([Buffer.alloc(KB)], { type: 'image/jpeg' }), - }) - uppy.on('complete', (result) => expect(result.successful.length).toEqual(1)) + expect(() => { + uppy.use(Tus, { autoRetry: false }) + }).toThrowError(/The `autoRetry` option was deprecated and has been removed/) + }) - await uppy.upload() + it('Throws errors if autoRetry option is `undefined`', () => { + const uppy = new Core() - scope.done() + expect(() => { + uppy.use(Tus, { autoRetry: undefined }) + }).toThrowError(/The `autoRetry` option was deprecated and has been removed/) }) }) diff --git a/yarn.lock b/yarn.lock index cf752f98f7..340e47d1bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9557,7 +9557,6 @@ __metadata: dependencies: "@uppy/companion-client": "workspace:*" "@uppy/utils": "workspace:*" - nock: ^13.1.4 tus-js-client: ^2.1.1 peerDependencies: "@uppy/core": ^2.0.0 @@ -30411,7 +30410,7 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard -"nock@npm:^13.1.0, nock@npm:^13.1.4": +"nock@npm:^13.1.0": version: 13.1.4 resolution: "nock@npm:13.1.4" dependencies: