tests/fixtures/project_staged_validation/version_changed/staged/composer.json

-{}

tests/src/Functional/UpdateLockTest.php

@@ -31,7 +31,10 @@ class UpdateLockTest extends AutomaticUpdatesFunctionalTestBase {
   protected function setUp(): void {
     parent::setUp();
 
-    $this->drupalLogin($this->rootUser);
+    $user = $this->createUser([
+      'administer site configuration',
+    ]);
+    $this->drupalLogin($user);
     $this->checkForUpdates();
   }
 

tests/src/Functional/UpdaterFormTest.php

@@ -4,7 +4,6 @@ namespace Drupal\Tests\automatic_updates\Functional;
 
 use Drupal\automatic_updates\Event\ReadinessCheckEvent;
 use Drupal\automatic_updates_test\Datetime\TestTime;
-use Drupal\Component\FileSystem\FileSystem;
 use Drupal\package_manager\Event\PostRequireEvent;
 use Drupal\package_manager\Event\PreApplyEvent;
 use Drupal\package_manager\Event\PreCreateEvent;
@@ -51,7 +50,15 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     parent::setUp();
 
     $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/drupal.9.8.1-security.xml');
-    $this->drupalLogin($this->rootUser);
+    $user = $this->createUser([
+      'administer site configuration',
+      'administer software updates',
+      'access administration pages',
+      'access site in maintenance mode',
+      'administer modules',
+      'access site reports',
+    ]);
+    $this->drupalLogin($user);
     $this->checkForUpdates();
   }
 
@@ -308,7 +315,11 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
 
     // We should get the same error if we log in as another user and try to
     // delete the staged update.
-    $this->drupalLogin($this->rootUser);
+    $user = $this->createUser([
+      'administer software updates',
+      'access site in maintenance mode',
+    ]);
+    $this->drupalLogin($user);
     $this->drupalGet('/admin/reports/updates/automatic-update');
     $assert_session->pageTextContains($conflict_message);
     $page->pressButton('Delete existing update');
@@ -511,9 +522,11 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
     // Confirm if the staged directory is deleted without using destroy(), then
     // an error message will be displayed on the page.
     // @see \Drupal\package_manager\Stage::getStagingRoot()
-    $dir = FileSystem::getOsTemporaryDirectory() . '/.package_manager' . $this->config('system.site')->get('uuid');
+    /** @var \Drupal\Core\File\FileSystemInterface $file_system */
+    $file_system = $this->container->get('file_system');
+    $dir = $file_system->getTempDirectory() . '/.package_manager' . $this->config('system.site')->get('uuid');
     $this->assertDirectoryExists($dir);
-    $this->container->get('file_system')->deleteRecursive($dir);
+    $file_system->deleteRecursive($dir);
     $this->getSession()->reload();
     $assert_session = $this->assertSession();
     $error_message = 'There was an error loading the pending update. Press the Cancel update button to start over.';

tests/src/Kernel/AutomaticUpdatesKernelTestBase.php

@@ -7,12 +7,13 @@ use Drupal\automatic_updates\Updater;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\automatic_updates\Traits\ValidationTestTrait;
 use Drupal\Tests\package_manager\Kernel\PackageManagerKernelTestBase;
-use Drupal\Tests\package_manager\Kernel\TestStage;
+use Drupal\Tests\package_manager\Kernel\TestStageTrait;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Utils;
+use Psr\Http\Message\RequestInterface;
 
 /**
  * Base class for kernel tests of the Automatic Updates module.
@@ -67,7 +68,7 @@ abstract class AutomaticUpdatesKernelTestBase extends PackageManagerKernelTestBa
     // By default, pretend we're running Drupal core 9.8.0 and a non-security
     // update to 9.8.1 is available.
     $this->setCoreVersion('9.8.1');
-    $this->setReleaseMetadata([__DIR__ . '/../../fixtures/release-history/drupal.9.8.2.xml']);
+    $this->setReleaseMetadata(['drupal' => __DIR__ . '/../../fixtures/release-history/drupal.9.8.2.xml']);
 
     // Set a last cron run time so that the cron frequency validator will run
     // from a sane state.
@@ -118,15 +119,24 @@ abstract class AutomaticUpdatesKernelTestBase extends PackageManagerKernelTestBa
    * Sets the release metadata file to use when fetching available updates.
    *
    * @param string[] $files
-   *   The paths of the XML metadata files to use.
+   *   The paths of the XML metadata files to use, keyed by project name.
    */
   protected function setReleaseMetadata(array $files): void {
     $responses = [];
-    foreach ($files as $file) {
+
+    foreach ($files as $project => $file) {
       $metadata = Utils::tryFopen($file, 'r');
-      $responses[] = new Response(200, [], Utils::streamFor($metadata));
+      $responses["/release-history/$project/current"] = new Response(200, [], Utils::streamFor($metadata));
     }
-    $handler = new MockHandler($responses);
+    $callable = function (RequestInterface $request) use ($responses): Response {
+      return $responses[$request->getUri()->getPath()] ?? new Response(404);
+    };
+
+    // The mock handler's queue consist of same callable as many times as the
+    // number of requests we expect to be made for update XML because it will
+    // retrieve one item off the queue for each request.
+    // @see \GuzzleHttp\Handler\MockHandler::__invoke()
+    $handler = new MockHandler(array_fill(0, count($responses), $callable));
     $this->client = new Client([
       'handler' => HandlerStack::create($handler),
     ]);
@@ -140,12 +150,7 @@ abstract class AutomaticUpdatesKernelTestBase extends PackageManagerKernelTestBa
  */
 class TestUpdater extends Updater {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getStagingRoot(): string {
-    return TestStage::$stagingRoot ?: parent::getStagingRoot();
-  }
+  use TestStageTrait;
 
 }
 
@@ -154,11 +159,6 @@ class TestUpdater extends Updater {
  */
 class TestCronUpdater extends CronUpdater {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getStagingRoot(): string {
-    return TestStage::$stagingRoot ?: parent::getStagingRoot();
-  }
+  use TestStageTrait;
 
 }

tests/src/Kernel/CronUpdaterTest.php

@@ -89,32 +89,32 @@ class CronUpdaterTest extends AutomaticUpdatesKernelTestBase {
     return [
       'disabled, normal release' => [
         CronUpdater::DISABLED,
-        "$fixture_dir/drupal.9.8.2.xml",
+        ['drupal' => "$fixture_dir/drupal.9.8.2.xml"],
         FALSE,
       ],
       'disabled, security release' => [
         CronUpdater::DISABLED,
-        "$fixture_dir/drupal.9.8.1-security.xml",
+        ['drupal' => "$fixture_dir/drupal.9.8.1-security.xml"],
         FALSE,
       ],
       'security only, security release' => [
         CronUpdater::SECURITY,
-        "$fixture_dir/drupal.9.8.1-security.xml",
+        ['drupal' => "$fixture_dir/drupal.9.8.1-security.xml"],
         TRUE,
       ],
       'security only, normal release' => [
         CronUpdater::SECURITY,
-        "$fixture_dir/drupal.9.8.2.xml",
+        ['drupal' => "$fixture_dir/drupal.9.8.2.xml"],
         FALSE,
       ],
       'enabled, normal release' => [
         CronUpdater::ALL,
-        "$fixture_dir/drupal.9.8.2.xml",
+        ['drupal' => "$fixture_dir/drupal.9.8.2.xml"],
         TRUE,
       ],
       'enabled, security release' => [
         CronUpdater::ALL,
-        "$fixture_dir/drupal.9.8.1-security.xml",
+        ['drupal' => "$fixture_dir/drupal.9.8.1-security.xml"],
         TRUE,
       ],
     ];
@@ -126,18 +126,19 @@ class CronUpdaterTest extends AutomaticUpdatesKernelTestBase {
    * @param string $setting
    *   Whether automatic updates should be enabled during cron. Possible values
    *   are 'disable', 'security', and 'patch'.
-   * @param string $release_data
+   * @param array $release_data
    *   If automatic updates are enabled, the path of the fake release metadata
-   *   that should be served when fetching information on available updates.
+   *   that should be served when fetching information on available updates,
+   *   keyed by project name.
    * @param bool $will_update
    *   Whether an update should be performed, given the previous two arguments.
    *
    * @dataProvider providerUpdaterCalled
    */
-  public function testUpdaterCalled(string $setting, string $release_data, bool $will_update): void {
+  public function testUpdaterCalled(string $setting, array $release_data, bool $will_update): void {
     // Our form alter does not refresh information on available updates, so
     // ensure that the appropriate update data is loaded beforehand.
-    $this->setReleaseMetadata([$release_data]);
+    $this->setReleaseMetadata($release_data);
     $this->setCoreVersion('9.8.0');
     update_get_available(TRUE);
 
@@ -247,7 +248,7 @@ class CronUpdaterTest extends AutomaticUpdatesKernelTestBase {
     $this->installConfig('automatic_updates');
     $this->setCoreVersion('9.8.0');
     // Ensure that there is a security release to which we should update.
-    $this->setReleaseMetadata([__DIR__ . "/../../fixtures/release-history/drupal.9.8.1-security.xml"]);
+    $this->setReleaseMetadata(['drupal' => __DIR__ . "/../../fixtures/release-history/drupal.9.8.1-security.xml"]);
 
     // If the pre- or post-destroy events throw an exception, it will not be
     // caught by the cron updater, but it *will* be caught by the main cron

tests/src/Kernel/ProjectInfoTest.php

@@ -3,12 +3,6 @@
 namespace Drupal\Tests\automatic_updates\Kernel;
 
 use Drupal\automatic_updates\ProjectInfo;
-use GuzzleHttp\Client;
-use GuzzleHttp\Handler\MockHandler;
-use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Psr7\Response;
-use GuzzleHttp\Psr7\Utils;
-use Psr\Http\Message\RequestInterface;
 
 /**
  * @coversDefaultClass \Drupal\automatic_updates\ProjectInfo
@@ -49,7 +43,7 @@ class ProjectInfoTest extends AutomaticUpdatesKernelTestBase {
       $metadata_fixtures['drupal'] = $fixtures_directory . 'drupal.9.8.2.xml';
     }
     $metadata_fixtures[$project] = "$fixtures_directory$fixture";
-    $this->setReleaseMetadataForProjects($metadata_fixtures);
+    $this->setReleaseMetadata($metadata_fixtures);
     $project_info = new ProjectInfo($project);
     $actual_releases = $project_info->getInstallableReleases();
     // Assert that we returned the correct releases in the expected order.
@@ -119,39 +113,11 @@ class ProjectInfoTest extends AutomaticUpdatesKernelTestBase {
    * @covers ::getInstallableReleases()
    */
   public function testNotPublishedProject() {
-    $this->setReleaseMetadataForProjects(['drupal' => __DIR__ . '/../../fixtures/release-history/drupal.9.8.2_unknown_status.xml']);
+    $this->setReleaseMetadata(['drupal' => __DIR__ . '/../../fixtures/release-history/drupal.9.8.2_unknown_status.xml']);
     $project_info = new ProjectInfo('drupal');
     $this->expectException('RuntimeException');
     $this->expectExceptionMessage("The project 'drupal' can not be updated because its status is any status besides published");
     $project_info->getInstallableReleases();
   }
 
-  /**
-   * Sets the release metadata file to use when fetching available updates.
-   *
-   * @param string[] $files
-   *   The paths of the XML metadata files to use, keyed by project name.
-   */
-  protected function setReleaseMetadataForProjects(array $files): void {
-    $responses = [];
-
-    foreach ($files as $project => $file) {
-      $metadata = Utils::tryFopen($file, 'r');
-      $responses["/release-history/$project/current"] = new Response(200, [], Utils::streamFor($metadata));
-    }
-    $callable = function (RequestInterface $request) use ($responses): Response {
-      return $responses[$request->getUri()->getPath()] ?? new Response(404);
-    };
-
-    // The mock handler's queue consist of same callable as many times as the
-    // number of requests we expect to be made for update XML because it will
-    // retrieve one item off the queue for each request.
-    // @see \GuzzleHttp\Handler\MockHandler::__invoke()
-    $handler = new MockHandler(array_fill(0, count($responses), $callable));
-    $this->client = new Client([
-      'handler' => HandlerStack::create($handler),
-    ]);
-    $this->container->set('http_client', $this->client);
-  }
-
 }

tests/src/Kernel/ReadinessValidation/InstalledVersionValidatorTest.php

+<?php
+
+namespace Drupal\Tests\automatic_updates\Kernel\ReadinessValidation;
+
+use Drupal\package_manager\ValidationResult;
+use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
+
+/**
+ * @covers \Drupal\automatic_updates\Validator\InstalledVersionValidator
+ *
+ * @group automatic_updates
+ */
+class InstalledVersionValidatorTest extends AutomaticUpdatesKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['automatic_updates'];
+
+  /**
+   * Tests that the installed version of Drupal is checked for updateability.
+   */
+  public function testInstalledVersionValidation(): void {
+    $this->setCoreVersion('9.8.0-dev');
+
+    $result = ValidationResult::createError([
+      'Drupal cannot be automatically updated from the installed version, 9.8.0-dev, because automatic updates from a dev version to any other version are not supported.',
+    ]);
+    $this->assertCheckerResultsFromManager([$result], TRUE);
+  }
+
+}

tests/src/Kernel/ReadinessValidation/StagedDatabaseUpdateValidatorTest.php

@@ -5,7 +5,6 @@ namespace Drupal\Tests\automatic_updates\Kernel\ReadinessValidation;
 use Drupal\package_manager\Exception\StageValidationException;
 use Drupal\package_manager\ValidationResult;
 use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
-use Drupal\Tests\package_manager\Kernel\TestStage;
 
 /**
  * @covers \Drupal\automatic_updates\Validator\StagedDatabaseUpdateValidator
@@ -30,40 +29,37 @@ class StagedDatabaseUpdateValidatorTest extends AutomaticUpdatesKernelTestBase {
    * {@inheritdoc}
    */
   protected function setUp(): void {
-    // In this test, we want to disable the lock file validator because, even
-    // though both the active and stage directories will have a valid lock file,
-    // this validator will complain because they don't differ at all.
-    $this->disableValidators[] = 'package_manager.validator.lock_file';
     parent::setUp();
 
-    TestStage::$stagingRoot = $this->vfsRoot->url();
+    $this->createTestProject();
 
     /** @var \Drupal\Tests\automatic_updates\Kernel\TestCronUpdater $updater */
     $updater = $this->container->get('automatic_updates.cron_updater');
     $updater->begin(['drupal' => '9.8.2']);
     $updater->stage();
+  }
 
-    $stage_dir = $updater->getStageDirectory();
-    mkdir($stage_dir);
+  /**
+   * {@inheritdoc}
+   */
+  protected function createTestProject(): void {
+    parent::createTestProject();
 
-    // To satisfy StagedProjectsValidator, copy the active Composer files into
-    // the staging area.
-    $active_dir = $this->getDrupalRoot();
-    @copy("$active_dir/composer.json", "$stage_dir/composer.json");
-    @copy("$active_dir/composer.lock", "$stage_dir/composer.lock");
-    mkdir("$stage_dir/vendor/composer", 0777, TRUE);
-    @copy("$active_dir/vendor/composer/installed.json", "$stage_dir/vendor/composer/installed.json");
+    $drupal_root = $this->getDrupalRoot();
+    $virtual_active_dir = $this->container->get('package_manager.path_locator')
+      ->getProjectRoot();
 
-    // Copy the .install and .post_update.php files from every installed module
-    // into the staging directory.
+    // Copy the .install and .post_update.php files from every installed module,
+    // in the *actual* Drupal code base that is running this test, into the
+    // virtual project (i.e., the active directory).
     $module_list = $this->container->get('module_handler')->getModuleList();
     foreach ($module_list as $name => $module) {
       $path = $module->getPath();
-      @mkdir("$stage_dir/$path", 0777, TRUE);
+      @mkdir("$virtual_active_dir/$path", 0777, TRUE);
 
       foreach (static::SUFFIXES as $suffix) {
         // If the source file doesn't exist, silence the warning it raises.
-        @copy("$active_dir/$path/$name.$suffix", "$stage_dir/$path/$name.$suffix");
+        @copy("$drupal_root/$path/$name.$suffix", "$virtual_active_dir/$path/$name.$suffix");
       }
     }
   }

tests/src/Kernel/ReadinessValidation/StagedProjectsValidatorTest.php

@@ -4,10 +4,8 @@ namespace Drupal\Tests\automatic_updates\Kernel\ReadinessValidation;
 
 use Drupal\package_manager\Event\PreApplyEvent;
 use Drupal\package_manager\Exception\StageValidationException;
+use Drupal\package_manager\ValidationResult;
 use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
-use Drupal\Tests\package_manager\Kernel\TestStage;
-use org\bovigo\vfs\vfsStream;
-use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * @covers \Drupal\automatic_updates\Validator\StagedProjectsValidator
@@ -21,131 +19,100 @@ class StagedProjectsValidatorTest extends AutomaticUpdatesKernelTestBase {
    */
   protected static $modules = ['automatic_updates'];
 
+  /**
+   * The active directory in the virtual file system.
+   *
+   * @var string
+   */
+  private $activeDir;
+
   /**
    * {@inheritdoc}
    */
   protected function setUp(): void {
-    // This test deals with fake sites that don't necessarily have lock files,
-    // so disable lock file validation.
-    $this->disableValidators[] = 'package_manager.validator.lock_file';
     parent::setUp();
+
+    $this->createTestProject();
+    $this->activeDir = $this->container->get('package_manager.path_locator')
+      ->getProjectRoot();
   }
 
   /**
-   * Runs the validator under test against an arbitrary pair of directories.
-   *
-   * @param string $active_dir
-   *   The active directory to validate.
-   * @param string $stage_dir
-   *   The stage directory to validate.
+   * Asserts a set of validation results when staged changes are applied.
    *
-   * @return \Drupal\package_manager\ValidationResult[]
-   *   The validation results.
+   * @param \Drupal\package_manager\ValidationResult[] $expected_results
+   *   The expected validation results.
    */
-  private function validate(string $active_dir, string $stage_dir): array {
-    $this->mockPathLocator($active_dir, $active_dir);
-
-    $stage_dir_exists = is_dir($stage_dir);
-    if ($stage_dir_exists) {
-      // If we are testing a fixture with existing stage directory then we
-      // need to use a virtual file system directory, so we can create a
-      // subdirectory using the stage ID after it is created below.
-      $stage_vfs_dir = vfsStream::newDirectory('au_stage');
-      $this->vfsRoot->addChild($stage_vfs_dir);
-      TestStage::$stagingRoot = $stage_vfs_dir->url();
-    }
-    else {
-      // If we are testing non-existent staging directory we can use the path
-      // directly.
-      TestStage::$stagingRoot = $stage_dir;
-    }
-
+  private function validate(array $expected_results): void {
+    /** @var \Drupal\automatic_updates\Updater $updater */
     $updater = $this->container->get('automatic_updates.updater');
-    $stage_id = $updater->begin(['drupal' => '9.8.2']);
-    if ($stage_dir_exists) {
-      // Copy the fixture's staging directory into a subdirectory using the
-      // stage ID as the directory name.
-      $sub_directory = vfsStream::newDirectory($stage_id);
-      $stage_vfs_dir->addChild($sub_directory);
-      (new Filesystem())->mirror($stage_dir, $sub_directory->url());
-    }
+    $updater->begin(['drupal' => '9.8.2']);
+    $updater->stage();
 
-    // The staged projects validator only runs before staged updates are
-    // applied. Since the active and stage directories may not exist, we don't
-    // want to invoke the other stages of the update because they may raise
-    // errors that are outside of the scope of what we're testing here.
     try {
       $updater->apply();
-      return [];
+      $this->assertEmpty($expected_results);
     }
     catch (StageValidationException $e) {
-      return $e->getResults();
+      $this->assertValidationResultsEqual($expected_results, $e->getResults());
     }
   }
 
   /**
-   * Tests that if an exception is thrown, the event will absorb it.
+   * Tests that exceptions are turned into validation errors.
    */
   public function testEventConsumesExceptionResults(): void {
-    // Prepare a fake site in the virtual file system which contains valid
-    // Composer data.
-    $fixture = __DIR__ . '/../../../fixtures/fake-site';
-    copy("$fixture/composer.json", 'public://composer.json');
-    mkdir('public://vendor/composer', 0777, TRUE);
-    copy("$fixture/vendor/composer/installed.json", 'public://vendor/composer/installed.json');
-
-    $event_dispatcher = $this->container->get('event_dispatcher');
-    // Disable the disk space validator, since it doesn't work with vfsStream,
-    // and the Git directory excluder, since it won't deal with this tiny
-    // virtual file system correctly.
-    $disable_subscribers = array_map([$this->container, 'get'], [
-      'package_manager.validator.disk_space',
-      'package_manager.git_excluder',
-    ]);
-    array_walk($disable_subscribers, [$event_dispatcher, 'removeSubscriber']);
-
     // Just before the staged changes are applied, delete the composer.json file
     // to trigger an error. This uses the highest possible priority to guarantee
     // it runs before any other subscribers.
-    $listener = function () {
-      unlink('public://composer.json');
+    $listener = function (): void {
+      unlink("$this->activeDir/composer.json");
     };
-    $event_dispatcher->addListener(PreApplyEvent::class, $listener, PHP_INT_MAX);
+    $this->container->get('event_dispatcher')
+      ->addListener(PreApplyEvent::class, $listener, PHP_INT_MAX);
 
-    $results = $this->validate('public://', '/fake/stage/dir');
-    $this->assertCount(1, $results);
-    $messages = reset($results)->getMessages();
-    $this->assertCount(1, $messages);
-    $this->assertStringContainsString('Composer could not find the config file: public:///composer.json', (string) reset($messages));
+    $result = ValidationResult::createError([
+      "Composer could not find the config file: $this->activeDir/composer.json\n",
+    ]);
+    $this->validate([$result]);
   }
 
   /**
-   * Tests validations errors.
+   * Tests validation errors, or lack thereof.
    *
    * @param string $fixtures_dir
-   *   The fixtures directory that provides the active and staged composer.lock
-   *   files.
-   * @param string $expected_summary
-   *   The expected error summary.
+   *   A directory containing `active.installed.json` and
+   *   `staged.installed.json` files. These will be used as the virtual
+   *   project's active and staged `vendor/composer/installed.json` files,
+   *   respectively.
+   * @param string|null $expected_summary
+   *   The expected error summary, or NULL if no errors are expected.
    * @param string[] $expected_messages
-   *   The expected error messages.
+   *   The expected error messages, if any.
    *
    * @dataProvider providerErrors
    */
-  public function testErrors(string $fixtures_dir, string $expected_summary, array $expected_messages): void {
-    $this->assertNotEmpty($fixtures_dir);
-    $this->assertDirectoryExists($fixtures_dir);
-
-    $results = $this->validate("$fixtures_dir/active", "$fixtures_dir/staged");
-    $this->assertCount(1, $results);
-    $result = array_pop($results);
-    $this->assertSame($expected_summary, (string) $result->getSummary());
-    $actual_messages = $result->getMessages();
-    $this->assertCount(count($expected_messages), $actual_messages);
-    foreach ($expected_messages as $message) {
-      $actual_message = array_shift($actual_messages);
-      $this->assertSame($message, (string) $actual_message);
+  public function testErrors(string $fixtures_dir, ?string $expected_summary, array $expected_messages): void {
+    $this->assertFileIsReadable("$fixtures_dir/active.installed.json");
+    $this->assertFileIsReadable("$fixtures_dir/staged.installed.json");
+
+    copy("$fixtures_dir/active.installed.json", "$this->activeDir/vendor/composer/installed.json");
+
+    // Before any other pre-apply listener runs, replaced the staged
+    // `vendor/composer/installed.json` with the fixture's
+    // `staged.installed.json`.
+    $listener = function (PreApplyEvent $event) use ($fixtures_dir): void {
+      copy("$fixtures_dir/staged.installed.json", $event->getStage()->getStageDirectory() . "/vendor/composer/installed.json");
+    };
+    $this->container->get('event_dispatcher')
+      ->addListener(PreApplyEvent::class, $listener, PHP_INT_MAX);
+
+    $expected_results = [];
+    if ($expected_messages) {
+      // @codingStandardsIgnoreLine
+      $expected_results[] = ValidationResult::createError($expected_messages, t($expected_summary));
     }
+    $this->validate($expected_results);
   }
 
   /**
@@ -155,7 +122,7 @@ class StagedProjectsValidatorTest extends AutomaticUpdatesKernelTestBase {
    *   Test cases for testErrors().
    */
   public function providerErrors(): array {
-    $fixtures_folder = realpath(__DIR__ . '/../../../fixtures/project_staged_validation');
+    $fixtures_folder = __DIR__ . '/../../../fixtures/project_staged_validation';
     return [
       'new_project_added' => [
         "$fixtures_folder/new_project_added",
@@ -181,17 +148,12 @@ class StagedProjectsValidatorTest extends AutomaticUpdatesKernelTestBase {
           "module 'drupal/dev-test_module' from 1.3.0 to 1.3.1.",
         ],
       ],
+      'no_errors' => [
+        "$fixtures_folder/no_errors",
+        NULL,
+        [],
+      ],
     ];
   }
 
-  /**
-   * Tests validation when there are no errors.
-   */
-  public function testNoErrors(): void {
-    $fixtures_dir = realpath(__DIR__ . '/../../../fixtures/project_staged_validation/no_errors');
-    $results = $this->validate("$fixtures_dir/active", "$fixtures_dir/staged");
-    $this->assertIsArray($results);
-    $this->assertEmpty($results);
-  }
-
 }

tests/src/Kernel/ReadinessValidation/UpdateVersionValidatorTest.php

@@ -131,7 +131,7 @@ class UpdateVersionValidatorTest extends AutomaticUpdatesKernelTestBase {
     // In order to test what happens when only security updates are enabled
     // during cron (the default behavior), ensure that the latest available
     // release is a security update.
-    $this->setReleaseMetadata([__DIR__ . '/../../../fixtures/release-history/drupal.9.8.1-security.xml']);
+    $this->setReleaseMetadata(['drupal' => __DIR__ . '/../../../fixtures/release-history/drupal.9.8.1-security.xml']);
 
     $this->setCoreVersion('9.7.1');
     $this->assertCheckerResultsFromManager([], TRUE);
@@ -256,6 +256,7 @@ class UpdateVersionValidatorTest extends AutomaticUpdatesKernelTestBase {
     $unstable_current_version = ValidationResult::createError([
       'Drupal cannot be automatically updated during cron from its current version, 9.8.0-alpha1, because Automatic Updates only supports updating from stable versions during cron.',
     ]);
+
     return [
       'unstable current version, cron disabled' => [
         CronUpdater::DISABLED,
@@ -275,21 +276,6 @@ class UpdateVersionValidatorTest extends AutomaticUpdatesKernelTestBase {
         '9.8.0-alpha1',
         [$unstable_current_version],
       ],
-      'dev current version, cron disabled' => [
-        CronUpdater::DISABLED,
-        '9.8.x-dev',
-        [],
-      ],
-      'dev current version, security updates allowed' => [
-        CronUpdater::SECURITY,
-        '9.8.x-dev',
-        [],
-      ],
-      'dev current version, all updates allowed' => [
-        CronUpdater::ALL,
-        '9.8.x-dev',
-        [],
-      ],
       // @todo In the 3 following test cases the installed version is not
       //   in a supported branch. These test expectations should be changed or
       //   moved to a new test when we add a validator to check if the installed

tests/src/Kernel/ReleaseChooserTest.php

@@ -21,7 +21,7 @@ class ReleaseChooserTest extends AutomaticUpdatesKernelTestBase {
    */
   protected function setUp(): void {
     parent::setUp();
-    $this->setReleaseMetadata([__DIR__ . '/../../fixtures/release-history/drupal.9.8.2-older-sec-release.xml']);
+    $this->setReleaseMetadata(['drupal' => __DIR__ . '/../../fixtures/release-history/drupal.9.8.2-older-sec-release.xml']);
 
   }
 

tests/src/Kernel/UpdaterTest.php

@@ -37,7 +37,7 @@ class UpdaterTest extends AutomaticUpdatesKernelTestBase {
     // Simulate that we're running Drupal 9.8.0 and a security update to 9.8.1
     // is available.
     $this->setCoreVersion('9.8.0');
-    $this->setReleaseMetadata([__DIR__ . '/../../fixtures/release-history/drupal.9.8.1-security.xml']);
+    $this->setReleaseMetadata(['drupal' => __DIR__ . '/../../fixtures/release-history/drupal.9.8.1-security.xml']);
 
     // Create a user who will own the stage even after the container is rebuilt.
     $user = $this->createUser([], NULL, TRUE, ['uid' => 2]);