[#76] Moved functionality from Artifact class to ArtifactCommand clas…

…s. (#80) * Move functionality from Artifact class to ArtifactCommand class. * Update coverage test name. * Check branch exisiting before do remove. * Revert to standard app entry
drevops · Mar 19, 2024 · 22c667c · 22c667c
1 parent 8f8307c
commit 22c667c
Show file tree

Hide file tree

Showing 9 changed files with 993 additions and 993 deletions.
diff --git a/src/Artifact.php b/src/Artifact.php
diff --git a/src/Commands/ArtifactCommand.php b/src/Commands/ArtifactCommand.php
diff --git a/src/GitArtifactGitRepository.php b/src/GitArtifactGitRepository.php
@@ -169,6 +169,14 @@ public function removeBranch($name, bool $force = FALSE): GitArtifactGitReposito
       return $this;
     }
 
+    $branches = $this->getBranches();
+    if (empty($branches)) {
+      return $this;
+    }
+    if (!in_array($name, $branches)) {
+      return $this;
+    }
+
     if (!$force) {
       return parent::removeBranch($name);
     }

diff --git a/tests/phpunit/Functional/BranchTest.php b/tests/phpunit/Functional/BranchTest.php
@@ -10,7 +10,7 @@
  * @group integration
  *
  * @covers \DrevOps\GitArtifact\GitTrait
- * @covers \DrevOps\GitArtifact\Artifact
+ * @covers \DrevOps\GitArtifact\Commands\ArtifactCommand
  * @covers \DrevOps\GitArtifact\FilesystemTrait
  */
 class BranchTest extends AbstractFunctionalTestCase {

diff --git a/tests/phpunit/Functional/ForcePushTest.php b/tests/phpunit/Functional/ForcePushTest.php
@@ -12,7 +12,7 @@
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  *
  * @covers \DrevOps\GitArtifact\GitTrait
- * @covers \DrevOps\GitArtifact\Artifact
+ * @covers \DrevOps\GitArtifact\Commands\ArtifactCommand
  * @covers \DrevOps\GitArtifact\FilesystemTrait
  */
 class ForcePushTest extends AbstractFunctionalTestCase {

diff --git a/tests/phpunit/Functional/GeneralTest.php b/tests/phpunit/Functional/GeneralTest.php
@@ -9,7 +9,7 @@
  *
  * @group integration
  *
- * @covers \DrevOps\GitArtifact\Artifact
+ * @covers \DrevOps\GitArtifact\Commands\ArtifactCommand
  * @covers \DrevOps\GitArtifact\FilesystemTrait
  */
 class GeneralTest extends AbstractFunctionalTestCase {

diff --git a/tests/phpunit/Functional/TagTest.php b/tests/phpunit/Functional/TagTest.php
@@ -10,7 +10,7 @@
  * @group integration
  *
  * @covers \DrevOps\GitArtifact\GitTrait
- * @covers \DrevOps\GitArtifact\Artifact
+ * @covers \DrevOps\GitArtifact\Commands\ArtifactCommand
  * @covers \DrevOps\GitArtifact\FilesystemTrait
  */
 class TagTest extends AbstractFunctionalTestCase {

diff --git a/tests/phpunit/Unit/AbstractUnitTestCase.php b/tests/phpunit/Unit/AbstractUnitTestCase.php
@@ -2,35 +2,24 @@
 
 namespace DrevOps\GitArtifact\Tests\Unit;
 
-use DrevOps\GitArtifact\Artifact;
-use DrevOps\GitArtifact\GitArtifactGit;
+use DrevOps\GitArtifact\Commands\ArtifactCommand;
 use DrevOps\GitArtifact\Tests\AbstractTestCase;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * Class AbstractUnitTestCase.
  */
 abstract class AbstractUnitTestCase extends AbstractTestCase {
 
   /**
-   * Mock of the class.
-   *
-   * @var \PHPUnit\Framework\MockObject\MockObject
+   * Artifact command.
    */
-  protected $mock;
+  protected ArtifactCommand $command;
 
   protected function setUp(): void {
     parent::setUp();
 
-    $mockBuilder = $this->getMockBuilder(Artifact::class);
-    $fileSystem = new Filesystem();
-    $gitWrapper = new GitArtifactGit();
-    $output = new ConsoleOutput();
-
-    $mockBuilder->setConstructorArgs([$gitWrapper, $fileSystem, $output]);
-    $this->mock = $mockBuilder->getMock();
-    $this->callProtectedMethod($this->mock, 'fsSetRootDir', [$this->fixtureDir]);
+    $this->command = new ArtifactCommand();
+    $this->callProtectedMethod($this->command, 'fsSetRootDir', [$this->fixtureDir]);
   }
 
 }
diff --git a/tests/phpunit/Unit/ExcludeTest.php b/tests/phpunit/Unit/ExcludeTest.php
@@ -9,7 +9,7 @@
  *
  * @group unit
  *
- * @covers \DrevOps\GitArtifact\Artifact
+ * @covers \DrevOps\GitArtifact\Commands\ArtifactCommand
  */
 class ExcludeTest extends AbstractUnitTestCase {
 
@@ -19,7 +19,7 @@ class ExcludeTest extends AbstractUnitTestCase {
   public function testExcludeExists(): void {
     $this->createFixtureExcludeFile();
 
-    $actual = $this->callProtectedMethod($this->mock, 'localExcludeExists', [$this->fixtureDir]);
+    $actual = $this->callProtectedMethod($this->command, 'localExcludeExists', [$this->fixtureDir]);
 
     $this->assertTrue($actual);
   }
@@ -40,7 +40,7 @@ public function testExcludeExists(): void {
   public function testExcludeEmpty(array $lines, bool $strict, bool $expected): void {
     $this->createFixtureExcludeFile(implode(PHP_EOL, $lines));
 
-    $actual = $this->callProtectedMethod($this->mock, 'localExcludeEmpty', [$this->fixtureDir, $strict]);
+    $actual = $this->callProtectedMethod($this->command, 'localExcludeEmpty', [$this->fixtureDir, $strict]);
 
     $this->assertEquals($expected, $actual);
   }