mirror of
https://github.com/composer/composer
synced 2025-05-09 00:22:53 +00:00
Merge branch '1.10'
This commit is contained in:
commit
7ea6d5d2e7
4 changed files with 22 additions and 4 deletions
|
@ -202,14 +202,27 @@ class RootPackageLoaderTest extends TestCase
|
|||
$this->assertEquals("dev-latest-production", $package->getPrettyVersion());
|
||||
}
|
||||
|
||||
public function testLoadExtraBranchVersion()
|
||||
/**
|
||||
* @dataProvider provideExtraBranchVersion
|
||||
*/
|
||||
public function testLoadExtraBranchVersion($branchVersion)
|
||||
{
|
||||
$package = $this->loadPackage(array(
|
||||
'extra' => array(
|
||||
'branch-version' => '1.2',
|
||||
'branch-version' => $branchVersion,
|
||||
),
|
||||
));
|
||||
|
||||
$this->assertEquals('1.2.x-dev', $package->getPrettyVersion());
|
||||
}
|
||||
|
||||
public function provideExtraBranchVersion()
|
||||
{
|
||||
return array(
|
||||
array('1.2'),
|
||||
array('1.2.x'),
|
||||
array('1.2-dev'),
|
||||
array('1.2.x-dev'),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue