From b4622885dea975b515f74d80380a5fb8556b918a Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 31 May 2012 16:03:25 +0200 Subject: [PATCH] Fix tests with openssl disabled --- .../Test/Repository/Vcs/GitHubDriverTest.php | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/tests/Composer/Test/Repository/Vcs/GitHubDriverTest.php b/tests/Composer/Test/Repository/Vcs/GitHubDriverTest.php index f800a499f..7353e86c5 100644 --- a/tests/Composer/Test/Repository/Vcs/GitHubDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/GitHubDriverTest.php @@ -33,10 +33,8 @@ class GitHubDriverTest extends \PHPUnit_Framework_TestCase public function testPrivateRepository() { - $scheme = extension_loaded('openssl') ? 'https' : 'http'; - $repoUrl = 'http://github.com/composer/packagist'; - $repoApiUrl = $scheme.'://api.github.com/repos/composer/packagist'; + $repoApiUrl = 'https://api.github.com/repos/composer/packagist'; $repoSshUrl = 'git@github.com:composer/packagist.git'; $identifier = 'v0.0.0'; $sha = 'SOMESHA'; @@ -82,7 +80,7 @@ class GitHubDriverTest extends \PHPUnit_Framework_TestCase $dist = $gitHubDriver->getDist($identifier); $this->assertEquals('zip', $dist['type']); - $this->assertEquals($scheme.'://github.com/composer/packagist/zipball/v0.0.0', $dist['url']); + $this->assertEquals('https://github.com/composer/packagist/zipball/v0.0.0', $dist['url']); $this->assertEquals('v0.0.0', $dist['reference']); $source = $gitHubDriver->getSource($identifier); @@ -92,7 +90,7 @@ class GitHubDriverTest extends \PHPUnit_Framework_TestCase $dist = $gitHubDriver->getDist($sha); $this->assertEquals('zip', $dist['type']); - $this->assertEquals($scheme.'://github.com/composer/packagist/zipball/v0.0.0', $dist['url']); + $this->assertEquals('https://github.com/composer/packagist/zipball/v0.0.0', $dist['url']); $this->assertEquals('v0.0.0', $dist['reference']); $source = $gitHubDriver->getSource($sha); @@ -103,10 +101,8 @@ class GitHubDriverTest extends \PHPUnit_Framework_TestCase public function testPublicRepository() { - $scheme = extension_loaded('openssl') ? 'https' : 'http'; - $repoUrl = 'http://github.com/composer/packagist'; - $repoApiUrl = $scheme.'://api.github.com/repos/composer/packagist'; + $repoApiUrl = 'https://api.github.com/repos/composer/packagist'; $identifier = 'v0.0.0'; $sha = 'SOMESHA'; @@ -132,7 +128,7 @@ class GitHubDriverTest extends \PHPUnit_Framework_TestCase $dist = $gitHubDriver->getDist($identifier); $this->assertEquals('zip', $dist['type']); - $this->assertEquals($scheme.'://github.com/composer/packagist/zipball/v0.0.0', $dist['url']); + $this->assertEquals('https://github.com/composer/packagist/zipball/v0.0.0', $dist['url']); $this->assertEquals($identifier, $dist['reference']); $source = $gitHubDriver->getSource($identifier); @@ -142,7 +138,7 @@ class GitHubDriverTest extends \PHPUnit_Framework_TestCase $dist = $gitHubDriver->getDist($sha); $this->assertEquals('zip', $dist['type']); - $this->assertEquals($scheme.'://github.com/composer/packagist/zipball/v0.0.0', $dist['url']); + $this->assertEquals('https://github.com/composer/packagist/zipball/v0.0.0', $dist['url']); $this->assertEquals($identifier, $dist['reference']); $source = $gitHubDriver->getSource($sha); @@ -153,10 +149,8 @@ class GitHubDriverTest extends \PHPUnit_Framework_TestCase public function testPrivateRepositoryNoInteraction() { - $scheme = extension_loaded('openssl') ? 'https' : 'http'; - $repoUrl = 'http://github.com/composer/packagist'; - $repoApiUrl = $scheme.'://api.github.com/repos/composer/packagist'; + $repoApiUrl = 'https://api.github.com/repos/composer/packagist'; $repoSshUrl = 'git@github.com:composer/packagist.git'; $identifier = 'v0.0.0'; $sha = 'SOMESHA';