public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Minor fixes and updated the rest of the code/tests to use HttpDownloader

Browse source
This commit is contained in:
Jordi Boggiano 2018-10-31 12:44:54 +01:00
parent 56805ecafe
commit 713bc4de1d
51 changed files with 461 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tests/Composer/Test/Util/GitLabTest.php
View file

@ -14,6 +14,7 @@ namespace Composer\Test\Util;
use Composer\Downloader\TransportException;
use Composer\Util\GitLab;
use Composer\Util\Http\Response;
use PHPUnit\Framework\TestCase;
/**
@ -49,17 +50,15 @@ class GitLabTest extends TestCase
->willReturn($this->password)
;
$rfs = $this->getRemoteFilesystemMock();
$rfs
$httpDownloader = $this->getHttpDownloaderMock();
$httpDownloader
->expects($this->once())
->method('getContents')
->method('get')
->with(
$this->equalTo($this->origin),
$this->equalTo(sprintf('http://%s/oauth/token', $this->origin)),
$this->isFalse(),
$this->equalTo($url = sprintf('http://%s/oauth/token', $this->origin)),
$this->anything()
)
->willReturn(sprintf('{"access_token": "%s", "token_type": "bearer", "expires_in": 7200}', $this->token))
->willReturn(new Response(array('url' => $url), 200, array(), sprintf('{"access_token": "%s", "token_type": "bearer", "expires_in": 7200}', $this->token)));
;
$config = $this->getConfigMock();
@ -69,7 +68,7 @@ class GitLabTest extends TestCase
->willReturn($this->getAuthJsonMock())
;
$gitLab = new GitLab($io, $config, null, $rfs);
$gitLab = new GitLab($io, $config, null, $httpDownloader);
$this->assertTrue($gitLab->authorizeOAuthInteractively('http', $this->origin, $this->message));
}
@ -94,10 +93,10 @@ class GitLabTest extends TestCase
->willReturn($this->password)
;
$rfs = $this->getRemoteFilesystemMock();
$rfs
$httpDownloader = $this->getHttpDownloaderMock();
$httpDownloader
->expects($this->exactly(5))
->method('getContents')
->method('get')
->will($this->throwException(new TransportException('', 401)))
;
@ -108,7 +107,7 @@ class GitLabTest extends TestCase
->willReturn($this->getAuthJsonMock())
;
$gitLab = new GitLab($io, $config, null, $rfs);
$gitLab = new GitLab($io, $config, null, $httpDownloader);
$gitLab->authorizeOAuthInteractively('https', $this->origin);
}
@ -129,15 +128,15 @@ class GitLabTest extends TestCase
return $this->getMockBuilder('Composer\Config')->getMock();
}
private function getRemoteFilesystemMock()
private function getHttpDownloaderMock()
{
$rfs = $this
->getMockBuilder('Composer\Util\RemoteFilesystem')
$httpDownloader = $this
->getMockBuilder('Composer\Util\HttpDownloader')
->disableOriginalConstructor()
->getMock()
;
return $rfs;
return $httpDownloader;
}
private function getAuthJsonMock()