From db2f09a36167622a5d868d6000ac1e88cba0afcb Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 7 Oct 2020 14:25:55 +0200 Subject: [PATCH] VersionGuesser: Update tests to match new git command generated --- .../Package/Version/VersionGuesserTest.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/Composer/Test/Package/Version/VersionGuesserTest.php b/tests/Composer/Test/Package/Version/VersionGuesserTest.php index 5d8d4f5eb..5347d1487 100644 --- a/tests/Composer/Test/Package/Version/VersionGuesserTest.php +++ b/tests/Composer/Test/Package/Version/VersionGuesserTest.php @@ -48,7 +48,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at($step)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); return 128; }) @@ -116,7 +116,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash, $anotherCommitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* master $commitHash Commit message\n(no branch) $anotherCommitHash Commit message\n"; return 0; @@ -153,7 +153,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash, $anotherCommitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = " arbitrary $commitHash Commit message\n* current $anotherCommitHash Another message\n"; return 0; @@ -200,7 +200,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash, $anotherCommitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = " latest-testing $commitHash Commit message\n* current $anotherCommitHash Another message\n"; return 0; @@ -247,7 +247,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash, $anotherCommitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* latest-testing $commitHash Commit message\n current $anotherCommitHash Another message\n master $anotherCommitHash Another message\n"; return 0; @@ -282,7 +282,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* (no branch) $commitHash Commit message\n"; return 0; @@ -313,7 +313,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* (HEAD detached at FETCH_HEAD) $commitHash Commit message\n"; return 0; @@ -343,7 +343,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self, $commitHash) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* (HEAD detached at 03a15d220) $commitHash Commit message\n"; return 0; @@ -372,7 +372,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* (HEAD detached at v2.0.5-alpha2) 433b98d4218c181bae01865901aac045585e8a1a Commit message\n"; return 0; @@ -413,7 +413,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* (HEAD detached at 1.0.0) c006f0c12bbbf197b5c071ffb1c0e9812bb14a4d Commit message\n"; return 0; @@ -455,7 +455,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* foo 03a15d220da53c52eddd5f32ffca64a7b3801bea Commit message\n"; return 0; @@ -485,7 +485,7 @@ class VersionGuesserTest extends TestCase ->expects($this->at(0)) ->method('execute') ->willReturnCallback(function ($command, &$output) use ($self) { - $self->assertEquals('git branch --no-color --no-abbrev -v', $command); + $self->assertEquals('git branch -a --no-color --no-abbrev -v', $command); $output = "* 1.5 03a15d220da53c52eddd5f32ffca64a7b3801bea Commit message\n"; return 0;