Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Core): pass total_bytes in ResumableUploader #7100

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/src/Upload/ResumableUploader.php
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ protected function getStatusResponse()
$request = new Request(
'PUT',
$this->resumeUri,
['Content-Range' => 'bytes */*']
['Content-Range' => 'bytes */' . $this->data->getSize()]
);

return $this->requestWrapper->send($request, $this->requestOptions);
Expand Down
27 changes: 24 additions & 3 deletions Core/tests/Unit/Upload/ResumableUploaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,23 +124,44 @@ public function testGetResumeUri()
$this->assertEquals($resumeUri, $uploader->getResumeUri());
}

public function testResumesUpload()
public function testResumeUploadReturnsIfAlreadySuccessful()
{
$response = new Response(200, [], $this->successBody);
$statusResponse = new Response(200, ['Range' => 'bytes 0-2']);

$this->requestWrapper->send(
Argument::type(RequestInterface::class),
Argument::type('array')
)->willReturn($response);

$uploader = new ResumableUploader(
$this->requestWrapper->reveal(),
$this->stream,
'http://www.example.com'
);

$this->assertEquals(
json_decode($this->successBody, true),
$uploader->resume('http://some-resume-uri.example.com')
);
}

public function testResumesFailedUpload()
{
$response = new Response(200, [], $this->successBody);
$statusResponse = new Response(200, ['Range' => 'bytes 0-2']);

$this->requestWrapper->send(
Argument::that(function ($request) {
return $request->getHeaderLine('Content-Range') === 'bytes */*';
return $request->getHeaderLine('Content-Range') === 'bytes */4';
}),
Argument::type('array')
)->willReturn($statusResponse);

$this->requestWrapper->send(
Argument::type(RequestInterface::class),
Argument::type('array')
)->willReturn($response);

$uploader = new ResumableUploader(
$this->requestWrapper->reveal(),
$this->stream,
Expand Down
Loading