Improve test for deleting package by including metadata

Author: codedmonkey

src/Doctrine/Entity/Version.php

@@ -44,6 +44,8 @@ public function __construct(Package $package)
         $this->package = $package;
 
         $this->installations = new VersionInstallations($this);
+
+        $package->getVersions()->add($this);
     }
 
     public function __toString(): string

src/Package/PackageMetadataResolver.php

@@ -163,8 +163,6 @@ private function updatePackage(Package $package, array $composerPackages, ?VcsDr
                 $version->setName($composerPackage->getPrettyVersion());
                 $version->setNormalizedName($composerPackage->getVersion());
                 $version->setDevelopment($composerPackage->isDev());
-
-                $package->getVersions()->add($version);
             }
 
             $this->updateVersion($version, $composerPackage, $driver);

tests/FunctionalTests/Controller/Dashboard/DashboardPackagesControllerTest.php

@@ -7,7 +7,6 @@
 use CodedMonkey\Dirigent\Doctrine\Repository\RegistryRepository;
 use CodedMonkey\Dirigent\Tests\Helper\MockEntityFactoryTrait;
 use CodedMonkey\Dirigent\Tests\Helper\WebTestCaseTrait;
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -89,10 +88,10 @@ public function testDelete(): void
         $client = static::createClient();
         $this->loginUser('admin');
 
-        $entityManager = $this->getService(EntityManagerInterface::class);
+        $mockEntities = $this->createMockPackageWithMetadata();
+        $this->persistEntities(...$mockEntities);
 
-        $package = $this->createMockPackage();
-        $this->persistEntities($package);
+        $package = $mockEntities[0];
 
         // Fetch package id prior to deleting it
         $packageId = $package->getId();
@@ -101,9 +100,9 @@ public function testDelete(): void
 
         $this->assertResponseStatusCodeSame(Response::HTTP_FOUND);
 
-        $entityManager->clear();
+        $this->clearEntities();
 
-        $savedPackage = $entityManager->find(Package::class, $packageId);
+        $savedPackage = $this->findEntity(Package::class, $packageId);
 
         $this->assertNull($savedPackage, 'The package was deleted.');
     }

tests/Helper/MockEntityFactoryTrait.php

@@ -2,6 +2,8 @@
 
 namespace CodedMonkey\Dirigent\Tests\Helper;
 
+use CodedMonkey\Dirigent\Doctrine\Entity\Metadata;
+use CodedMonkey\Dirigent\Doctrine\Entity\MetadataRequireLink;
 use CodedMonkey\Dirigent\Doctrine\Entity\Package;
 use CodedMonkey\Dirigent\Doctrine\Entity\User;
 use CodedMonkey\Dirigent\Doctrine\Entity\Version;
@@ -11,6 +13,20 @@
 
 trait MockEntityFactoryTrait
 {
+    protected function createMockMetadata(Version $version): Metadata
+    {
+        $package = $version->getPackage();
+
+        $metadata = new Metadata($version);
+        $metadata->setPackageName($package->getName());
+        $metadata->setVersionName($version->getName());
+        $metadata->setNormalizedVersionName($version->getNormalizedName());
+
+        new MetadataRequireLink($metadata, 'vendor/dependency', '^1.0', 0);
+
+        return $metadata;
+    }
+
     protected function createMockPackage(): Package
     {
         $package = new Package();
@@ -19,6 +35,20 @@ protected function createMockPackage(): Package
         return $package;
     }
 
+    /**
+     * @return array{Package, Version, Metadata}
+     */
+    protected function createMockPackageWithMetadata(): array
+    {
+        $package = $this->createMockPackage();
+        $version = $this->createMockVersion($package);
+        $metadata = $this->createMockMetadata($version);
+
+        $version->setCurrentMetadata($metadata);
+
+        return [$package, $version, $metadata];
+    }
+
     protected function createMockUser(bool $mfaEnabled = false): User
     {
         $user = new User();
@@ -35,13 +65,12 @@ protected function createMockUser(bool $mfaEnabled = false): User
         return $user;
     }
 
-    protected function createMockVersion(Package $package, string $versionName = '1.0.0'): Version
+    protected function createMockVersion(Package $package, string $versionName = '1.0.0', bool $development = false): Version
     {
         $version = new Version($package);
         $version->setName($versionName);
         $version->setNormalizedName((new VersionParser())->normalize($versionName));
-
-        $package->getVersions()->add($version);
+        $version->setDevelopment($development);
 
         return $version;
     }