From 587413285736c73fbcac22bcaa4308d6b124a46c Mon Sep 17 00:00:00 2001 From: ianlet Date: Thu, 11 Aug 2016 22:38:59 -0400 Subject: [PATCH] return https url of the repository given gitlab project is public --- src/Composer/Repository/Vcs/GitLabDriver.php | 2 +- .../Test/Repository/Vcs/GitLabDriverTest.php | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/src/Composer/Repository/Vcs/GitLabDriver.php b/src/Composer/Repository/Vcs/GitLabDriver.php index d542e23d5..042c1d8a9 100644 --- a/src/Composer/Repository/Vcs/GitLabDriver.php +++ b/src/Composer/Repository/Vcs/GitLabDriver.php @@ -148,7 +148,7 @@ class GitLabDriver extends VcsDriver */ public function getRepositoryUrl() { - return $this->project['ssh_url_to_repo']; + return $this->project['public'] ? $this->project['http_url_to_repo'] : $this->project['ssh_url_to_repo']; } /** diff --git a/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php b/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php index 70bb94843..268d0c0a0 100644 --- a/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php +++ b/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php @@ -69,6 +69,7 @@ class GitLabDriverTest extends TestCase { "id": 17, "default_branch": "mymaster", + "public": false, "http_url_to_repo": "https://gitlab.com/mygroup/myproject.git", "ssh_url_to_repo": "git@gitlab.com:mygroup/myproject.git", "last_activity_at": "2014-12-01T09:17:51.000+01:00", @@ -97,6 +98,45 @@ JSON; return $driver; } + /** + * @dataProvider getInitializeUrls + */ + public function testInitializePublicProject($url, $apiUrl) + { + // @link http://doc.gitlab.com/ce/api/projects.html#get-single-project + $projectData = <<remoteFilesystem + ->getContents('gitlab.com', $apiUrl, false) + ->willReturn($projectData) + ->shouldBeCalledTimes(1) + ; + + $driver = new GitLabDriver(array('url' => $url), $this->io->reveal(), $this->config, $this->process->reveal(), $this->remoteFilesystem->reveal()); + $driver->initialize(); + + $this->assertEquals($apiUrl, $driver->getApiUrl(), 'API URL is derived from the repository URL'); + $this->assertEquals('mymaster', $driver->getRootIdentifier(), 'Root identifier is the default branch in GitLab'); + $this->assertEquals('https://gitlab.com/mygroup/myproject.git', $driver->getRepositoryUrl(), 'The repository URL is the SSH one by default'); + $this->assertEquals('https://gitlab.com/mygroup/myproject', $driver->getUrl()); + + return $driver; + } + public function testGetDist() { $driver = $this->testInitialize('https://gitlab.com/mygroup/myproject', 'https://gitlab.com/api/v3/projects/mygroup%2Fmyproject'); @@ -126,6 +166,20 @@ JSON; $this->assertEquals($expected, $driver->getSource($reference)); } + public function testGetSource_GivenPublicProject() + { + $driver = $this->testInitializePublicProject('https://gitlab.com/mygroup/myproject', 'https://gitlab.com/api/v3/projects/mygroup%2Fmyproject', true); + + $reference = 'c3ebdbf9cceddb82cd2089aaef8c7b992e536363'; + $expected = array( + 'type' => 'git', + 'url' => 'https://gitlab.com/mygroup/myproject.git', + 'reference' => $reference, + ); + + $this->assertEquals($expected, $driver->getSource($reference)); + } + public function testGetTags() { $driver = $this->testInitialize('https://gitlab.com/mygroup/myproject', 'https://gitlab.com/api/v3/projects/mygroup%2Fmyproject');