automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php

-<?php
-
-namespace Drupal\Tests\automatic_updates_extensions\Functional;
-
-use Drupal\automatic_updates\Event\ReadinessCheckEvent;
-use Drupal\automatic_updates_test\EventSubscriber\TestSubscriber1;
-use Drupal\package_manager\Event\PreApplyEvent;
-use Drupal\package_manager\ValidationResult;
-use Drupal\Tests\automatic_updates\Functional\AutomaticUpdatesFunctionalTestBase;
-use Drupal\Tests\automatic_updates\Traits\ValidationTestTrait;
-use Drupal\Tests\automatic_updates_extensions\Traits\FormTestTrait;
-use Drupal\Tests\package_manager\Traits\PackageManagerBypassTestTrait;
-
-/**
- * Tests updating using the form.
- *
- * @group automatic_updates_extensions
- */
-class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
-
-  use ValidationTestTrait;
-  use FormTestTrait;
-  use PackageManagerBypassTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'automatic_updates_test',
-    'automatic_updates_extensions',
-    'automatic_updates_extensions_test',
-    'block',
-    'semver_test',
-    'aaa_update_test',
-  ];
-
-  /**
-   * Data provider for testSuccessfulUpdate().
-   *
-   * @return array[]
-   *   The test cases.
-   */
-  public function providerSuccessfulUpdate() {
-    return [
-      'maintiance_mode_on, semver' => [TRUE, 'semver_test', '8.1.0', '8.1.1'],
-      'maintiance_mode_off, legacy' => [FALSE, 'aaa_update_test', '8.x-2.0', '8.x-2.1'],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    // In this test class, some modules are added and this validator will
-    // complain because these are not installed via composer. This validator
-    // already has test coverage.
-    // @see \Drupal\Tests\automatic_updates_extensions\Build\ModuleUpdateTest
-    $this->disableValidators[] = 'automatic_updates_extensions.validator.packages_installed_with_composer';
-    parent::setUp();
-    $user = $this->createUser([
-      'administer site configuration',
-      'administer software updates',
-      'access site in maintenance mode',
-    ]);
-    // We need this fixture as only projects installed via composer will show up
-    // on the form.
-    $this->container->get('state')->set('automatic_updates_extensions_test.active_path', __DIR__ . '/../../fixtures/active_composer/two_projects');
-    $this->drupalLogin($user);
-    $this->drupalPlaceBlock('local_tasks_block', ['primary' => TRUE]);
-  }
-
-  /**
-   * Sets installed project version.
-   *
-   * @todo This is copied from core. We need to file a core issue so we do not
-   *    have to copy this.
-   */
-  protected function setProjectInstalledVersion($project_versions) {
-    $this->config('update.settings')
-      ->set('fetch.url', $this->baseUrl . '/test-release-history')
-      ->save();
-    $system_info = [];
-    foreach ($project_versions as $project_name => $version) {
-      $system_info[$project_name] = [
-        'project' => $project_name,
-        'version' => $version,
-        'hidden' => FALSE,
-      ];
-    }
-    $system_info['drupal'] = [
-      'project' => 'drupal',
-      'version' => '8.0.0',
-      'hidden' => FALSE,
-    ];
-    $this->config('update_test.settings')
-      ->set('system_info', $system_info)
-      ->save();
-  }
-
-  /**
-   * Asserts the table shows the updates.
-   *
-   * @param string $expected_project_title
-   *   The expected project title.
-   * @param string $expected_installed_version
-   *   The expected installed version.
-   * @param string $expected_target_version
-   *   The expected target version.
-   */
-  private function assertTableShowsUpdates(string $expected_project_title, string $expected_installed_version, string $expected_target_version): void {
-    $this->assertUpdateTableRow($this->assertSession(), $expected_project_title, $expected_installed_version, $expected_target_version);
-  }
-
-  /**
-   * Asserts the form shows no updates.
-   */
-  private function assertNoUpdates(): void {
-    $assert = $this->assertSession();
-    $assert->buttonNotExists('Update');
-    $assert->pageTextContains('There are no available updates.');
-  }
-
-  /**
-   * Tests an update that has no errors or special conditions.
-   *
-   * @param bool $maintenance_mode_on
-   *   Whether maintenance should be on at the beginning of the update.
-   * @param string $project_name
-   *   The project name.
-   * @param string $installed_version
-   *   The installed version.
-   * @param string $target_version
-   *   The target version.
-   *
-   * @dataProvider providerSuccessfulUpdate
-   */
-  public function testSuccessfulUpdate(bool $maintenance_mode_on, string $project_name, string $installed_version, string $target_version): void {
-    // Disable the scaffold file permissions validator because it will try to
-    // read composer.json from the staging area, which won't exist because
-    // Package Manager is bypassed.
-    $this->disableValidators(['automatic_updates.validator.scaffold_file_permissions']);
-
-    $this->container->get('theme_installer')->install(['automatic_updates_theme_with_updates']);
-    $this->updateProject = $project_name;
-    $this->setReleaseMetadata(__DIR__ . '/../../../../tests/fixtures/release-history/drupal.9.8.2.xml');
-    $this->setReleaseMetadata(__DIR__ . "/../../fixtures/release-history/$project_name.1.1.xml");
-    $this->setProjectInstalledVersion([$project_name => $installed_version]);
-    $this->checkForUpdates();
-    $state = $this->container->get('state');
-    $state->set('system.maintenance_mode', $maintenance_mode_on);
-
-    $page = $this->getSession()->getPage();
-    // Navigate to the automatic updates form.
-    $this->drupalGet('/admin/reports/updates');
-    $this->clickLink('Update Extensions');
-    $this->assertTableShowsUpdates(
-      $project_name === 'semver_test' ? 'Semver Test' : 'AAA Update test',
-      $installed_version,
-      $target_version
-    );
-    $page->checkField('projects[' . $this->updateProject . ']');
-    $page->pressButton('Update');
-    $this->checkForMetaRefresh();
-    $this->assertUpdateStagedTimes(1);
-    // Confirm that the site was put into maintenance mode if needed.
-    $this->assertSame($state->get('system.maintenance_mode'), $maintenance_mode_on);
-    $assert_session = $this->assertSession();
-    $possible_update_message = 'Possible database updates were detected in the following extensions; you may be redirected to the database update page in order to complete the update process.';
-    $assert_session->pageTextContains($possible_update_message);
-    $assert_session->pageTextContainsOnce('System');
-    $assert_session->pageTextContainsOnce('Automatic Updates Theme With Updates');
-
-    $page->pressButton('Continue');
-    $this->checkForMetaRefresh();
-
-    $assert_session->addressEquals('/admin/reports/updates');
-    // Confirm that the site was in maintenance before the update was applied.
-    // @see \Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber::handleEvent()
-    $this->assertTrue($state->get(PreApplyEvent::class . '.system.maintenance_mode'));
-    $assert_session->pageTextContainsOnce('Update complete!');
-    // Confirm the site was returned to the original maintenance mode state.
-    $this->assertSame($state->get('system.maintenance_mode'), $maintenance_mode_on);
-  }
-
-  /**
-   * Tests the form when modules requiring an update not installed via composer.
-   */
-  public function testNonComposerProjects(): void {
-    $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/aaa_update_test.1.1.xml');
-    $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
-    $this->config('update.settings')
-      ->set('fetch.url', $this->baseUrl . '/test-release-history')
-      ->save();
-    $this->setProjectInstalledVersion(
-      [
-        'aaa_update_test' => '8.x-2.x',
-        'semver_test' => '8.1.0',
-      ]
-    );
-
-    // One module not installed through composer.
-    $this->container->get('state')->set('automatic_updates_extensions_test.active_path', __DIR__ . '/../../fixtures/active_composer/one_project');
-    $assert = $this->assertSession();
-    $user = $this->createUser(
-      [
-        'administer site configuration',
-        'administer software updates',
-      ]
-    );
-    $this->drupalLogin($user);
-    $this->checkForUpdates();
-    $this->drupalGet('admin/reports/updates/automatic-update-extensions');
-    $assert->pageTextContains('Other updates were found, but they must be performed manually. See the list of available updates for more information.');
-    $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
-
-    // Both of the modules not installed through composer.
-    $this->container->get('state')->set('automatic_updates_extensions_test.active_path', __DIR__ . '/../../fixtures/active_composer/no_project');
-    $this->getSession()->reload();
-    $assert->pageTextContains('Updates were found, but they must be performed manually. See the list of available updates for more information.');
-    $this->assertNoUpdates();
-  }
-
-  /**
-   * Tests the form when a module requires an update.
-   */
-  public function testHasUpdate(): void {
-    $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
-    $assert = $this->assertSession();
-    $user = $this->createUser(['administer site configuration']);
-    $this->drupalLogin($user);
-    $this->setProjectInstalledVersion(['semver_test' => '8.1.0']);
-    $this->checkForUpdates();
-    $this->drupalGet('admin/reports/updates/automatic-update-extensions');
-    $assert->pageTextContains('Access Denied');
-    $assert->pageTextNotContains('Automatic Updates Form');
-    $user = $this->createUser(['administer software updates']);
-    $this->drupalLogin($user);
-    $this->drupalGet('admin/reports/updates/automatic-update-extensions');
-    $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
-    $assert->pageTextContains('Automatic Updates Form');
-    $assert->buttonExists('Update');
-  }
-
-  /**
-   * Tests the form when there are no available updates.
-   */
-  public function testNoUpdate(): void {
-    $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
-    $user = $this->createUser([
-      'administer site configuration',
-      'administer software updates',
-    ]);
-    $this->drupalLogin($user);
-    $this->setProjectInstalledVersion(['semver_test' => '8.1.1']);
-    $this->checkForUpdates();
-    $this->drupalGet('admin/reports/updates/automatic-update-extensions');
-    $this->assertNoUpdates();
-  }
-
-  /**
-   * Test the form for errors.
-   */
-  public function testErrors(): void {
-    $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
-    $assert = $this->assertSession();
-    $user = $this->createUser([
-      'administer site configuration',
-      'administer software updates',
-    ]);
-    $this->drupalLogin($user);
-    $this->setProjectInstalledVersion(['semver_test' => '8.1.0']);
-    $this->checkForUpdates();
-    $this->drupalGet('admin/reports/updates/automatic-update-extensions');
-    $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
-    $message = t("You've not experienced Shakespeare until you have read him in the original Klingon.");
-    $error = ValidationResult::createError([$message]);
-    TestSubscriber1::setTestResult([$error], ReadinessCheckEvent::class);
-    $this->getSession()->reload();
-    $assert->pageTextContains($message);
-    $assert->pageTextContains(static::$errorsExplanation);
-    $assert->pageTextNotContains(static::$warningsExplanation);
-    $assert->buttonNotExists('Update');
-  }
-
-  /**
-   * Test the form for warning messages.
-   */
-  public function testWarnings(): void {
-    $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
-    $assert = $this->assertSession();
-    $this->setProjectInstalledVersion(['semver_test' => '8.1.0']);
-    $this->checkForUpdates();
-    $message = t("Warning! Updating this module may cause an error.");
-    $warning = ValidationResult::createWarning([$message]);
-    TestSubscriber1::setTestResult([$warning], ReadinessCheckEvent::class);
-    // Navigate to the automatic updates form.
-    $this->drupalGet('/admin/reports/updates');
-    $this->clickLink('Update Extensions');
-    $this->assertTableShowsUpdates('Semver Test', '8.1.0', '8.1.1');
-    $assert->pageTextContains(static::$warningsExplanation);
-    $assert->pageTextNotContains(static::$errorsExplanation);
-    $assert->buttonExists('Update');
-  }
-
-}

automatic_updates_extensions/tests/src/Functional/UpdaterFormTestBase.php

+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\Tests\automatic_updates_extensions\Functional;
+
+use Drupal\fixture_manipulator\ActiveFixtureManipulator;
+use Drupal\package_manager\PathLocator;
+use Drupal\Tests\automatic_updates_extensions\Traits\FormTestTrait;
+use Drupal\Tests\automatic_updates\Functional\UpdaterFormTestBase as UpdaterFormFunctionalTestBase;
+
+/**
+ * Base class for functional tests of updater form.
+ *
+ * @internal
+ *   This class is an internal part of the module's testing infrastructure and
+ *   should not be used by external code.
+ */
+abstract class UpdaterFormTestBase extends UpdaterFormFunctionalTestBase {
+
+  use FormTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $errorsExplanation = 'Your site cannot be automatically updated until further action is performed.';
+
+  /**
+   * The path of the test project's active directory.
+   *
+   * @var string
+   */
+  private $activeDir;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'automatic_updates_extensions',
+    'semver_test',
+    'aaa_update_test',
+    'automatic_updates_extensions_test',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $this->activeDir = $this->container->get(PathLocator::class)->getProjectRoot();
+    (new ActiveFixtureManipulator())
+      // Add a package where the Composer package name,
+      // drupal/semver_test_package_name, does not match the project name,
+      // semver_test.
+      ->addPackage(
+        [
+          'name' => 'drupal/semver_test_package_name',
+          'version' => '8.1.0',
+          'type' => 'drupal-module',
+        ],
+        extra_files: [
+          'semver_test.info.yml' => '{name: "Semver Test", project: "semver_test", type: "module"}',
+        ]
+      )
+      ->addPackage([
+        'name' => 'drupal/aaa_update_test',
+        'version' => '2.0.0',
+        'type' => 'drupal-module',
+      ])
+      ->addPackage([
+        'name' => 'drupal/automatic_updates_extensions_test_theme',
+        'version' => '2.0.0',
+        'type' => 'drupal-theme',
+      ])
+      ->commitChanges();
+    $this->drupalPlaceBlock('local_tasks_block', ['primary' => TRUE]);
+  }
+
+  /**
+   * Sets installed project version.
+   *
+   * @todo Remove this function with use of the trait from the Update module in
+   *   https://drupal.org/i/3348234.
+   */
+  protected function setProjectInstalledVersion($project_versions): void {
+    $this->config('update.settings')
+      ->set('fetch.url', $this->baseUrl . '/test-release-history')
+      ->save();
+    $system_info = [];
+    foreach ($project_versions as $project_name => $version) {
+      $system_info[$project_name] = [
+        'project' => $project_name,
+        'version' => $version,
+        'hidden' => FALSE,
+      ];
+    }
+    $system_info['drupal'] = [
+      'project' => 'drupal',
+      'version' => '8.0.0',
+      'hidden' => FALSE,
+    ];
+    $this->config('update_test.settings')
+      ->set('system_info', $system_info)
+      ->save();
+  }
+
+  /**
+   * Asserts the table shows the updates.
+   *
+   * @param string $expected_project_title
+   *   The expected project title.
+   * @param string $expected_installed_version
+   *   The expected installed version.
+   * @param string $expected_target_version
+   *   The expected target version.
+   * @param int $row
+   *   The row number.
+   */
+  protected function assertTableShowsUpdates(string $expected_project_title, string $expected_installed_version, string $expected_target_version, int $row = 1): void {
+    $this->assertUpdateTableRow($this->assertSession(), $expected_project_title, $expected_installed_version, $expected_target_version, $row);
+  }
+
+  /**
+   * Asserts the form shows no updates.
+   */
+  protected function assertNoUpdates(): void {
+    $assert = $this->assertSession();
+    $assert->buttonNotExists('Update');
+    $assert->pageTextContains('There are no available updates.');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkForUpdates(): void {
+    $this->drupalGet('/admin/modules/automatic-update-extensions');
+    $this->clickLink('Check manually');
+    $this->checkForMetaRefresh();
+  }
+
+  /**
+   * Continue the update after checking the backup warning checkbox.
+   */
+  protected function acceptWarningAndUpdate(): void {
+    $page = $this->getSession()->getPage();
+    $page->pressButton('Continue');
+    $this->assertSession()->statusMessageContains('Warning: Updating contributed modules or themes may leave your site inoperable or looking wrong. field is required.', 'error');
+    $page->checkField('backup');
+    $page->pressButton('Continue');
+    $this->checkForMetaRefresh();
+  }
+
+}

automatic_updates_extensions/tests/src/Kernel/AutomaticUpdatesExtensionsKernelTestBase.php

 <?php
 
-namespace Drupal\Tests\automatic_updates_extensions\Kernel;
+declare(strict_types = 1);
 
-use Drupal\automatic_updates_extensions\ExtensionUpdater;
+namespace Drupal\Tests\automatic_updates_extensions\Kernel;
 
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\package_manager\Exception\StageValidationException;
+use Drupal\automatic_updates_extensions\ExtensionUpdateStage;
+use Drupal\fixture_manipulator\ActiveFixtureManipulator;
+use Drupal\package_manager\Event\PreOperationStageEvent;
+use Drupal\package_manager\Exception\StageEventException;
+use Drupal\package_manager\Validator\ComposerValidator;
 use Drupal\Tests\automatic_updates\Kernel\AutomaticUpdatesKernelTestBase;
-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 Extensions module.
+ *
+ * @internal
+ *   This class is an internal part of the module's testing infrastructure and
+ *   should not be used by external code.
  */
 abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdatesKernelTestBase {
 
@@ -25,7 +25,7 @@ abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdates
    */
   protected static $modules = [
     'automatic_updates_extensions',
-    'automatic_updates_test_release_history',
+    'package_manager_test_release_history',
   ];
 
   /**
@@ -37,54 +37,42 @@ abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdates
     // server. This should be okay in most situations because, apart from the
     // validator, only Composer Stager needs run Composer, and
     // package_manager_bypass is disabling those operations.
-    $this->disableValidators[] = 'package_manager.validator.composer_executable';
+    $this->disableValidators[] = ComposerValidator::class;
     parent::setUp();
+    // Install additional packages that will be needed in tests.
+    (new ActiveFixtureManipulator())
+      ->addPackage([
+        "name" => "drupal/my_module",
+        "version" => "9.8.0",
+        "type" => "drupal-module",
+      ])
+      ->addPackage([
+        "name" => "drupal/contrib_profile1",
+        "version" => "1.0.0",
+        "type" => "drupal-profile",
+      ])
+      ->addPackage([
+        "name" => "drupal/my_dev_module",
+        "version" => "9.8.1",
+        "type" => "drupal-module",
+      ], TRUE)
+      ->addPackage([
+        "name" => "drupal/semver_test",
+        "version" => "8.1.0",
+        "type" => "drupal-module",
+      ])
+      ->addPackage([
+        "name" => "drupal/aaa_update_test",
+        "version" => "1.0.0",
+        "type" => "drupal-module",
+      ])
+      ->addPackage([
+        "name" => "drupal/package_manager_test_update",
+        "version" => "1.0.0",
+        "type" => "drupal-module",
+      ])->commitChanges();
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function register(ContainerBuilder $container) {
-    parent::register($container);
-
-    // Use the test-only implementations of the regular and cron updaters.
-    $overrides = [
-      'automatic_updates_extensions.updater' => TestExtensionUpdater::class,
-    ];
-    foreach ($overrides as $service_id => $class) {
-      if ($container->hasDefinition($service_id)) {
-        $container->getDefinition($service_id)->setClass($class);
-      }
-    }
-  }
-
-  /**
-   * Creates a stage object for testing purposes.
-   *
-   * @return \Drupal\automatic_updates_extensions\ExtensionUpdater
-   *   A stage object, with test-only modifications.
-   */
-  protected function createUpdater(): ExtensionUpdater {
-    return new TestExtensionUpdater(
-      $this->container->get('config.factory'),
-      $this->container->get('package_manager.path_locator'),
-      $this->container->get('package_manager.beginner'),
-      $this->container->get('package_manager.stager'),
-      $this->container->get('package_manager.committer'),
-      $this->container->get('file_system'),
-      $this->container->get('event_dispatcher'),
-      $this->container->get('tempstore.shared'),
-      $this->container->get('datetime.time')
-    );
-  }
-
-  /**
-   * The client.
-   *
-   * @var \GuzzleHttp\Client
-   */
-  protected $client;
-
   /**
    * Asserts validation results are returned from a stage life cycle event.
    *
@@ -97,83 +85,25 @@ abstract class AutomaticUpdatesExtensionsKernelTestBase extends AutomaticUpdates
    *   be passed if $expected_results is not empty.
    */
   protected function assertUpdateResults(array $project_versions, array $expected_results, string $event_class = NULL): void {
-    $updater = $this->createExtensionUpdater();
+    $stage = $this->container->get(ExtensionUpdateStage::class);
 
     try {
-      $updater->begin($project_versions);
-      $updater->stage();
-      $updater->apply();
-      $updater->postApply();
-      $updater->destroy();
+      $stage->begin($project_versions);
+      $stage->stage();
+      $stage->apply();
+      $stage->postApply();
+      $stage->destroy();
 
       // If we did not get an exception, ensure we didn't expect any results.
       $this->assertEmpty($expected_results);
     }
-    catch (StageValidationException $e) {
+    catch (StageEventException $e) {
       $this->assertNotEmpty($expected_results);
-      $this->assertValidationResultsEqual($expected_results, $e->getResults());
-      // TestStage::dispatch() attaches the event object to the exception so
-      // that we can analyze it.
-      $this->assertNotEmpty($event_class);
-      $this->assertInstanceOf($event_class, $e->event);
+      $exception_event = $e->event;
+      $this->assertInstanceOf($event_class, $exception_event);
+      $this->assertInstanceOf(PreOperationStageEvent::class, $exception_event);
+      $this->assertValidationResultsEqual($expected_results, $e->event->getResults());
     }
   }
 
-  /**
-   * 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);
-  }
-
-  /**
-   * Creates an extension updater object for testing purposes.
-   *
-   * @return \Drupal\Tests\automatic_updates_extensions\Kernel\TestExtensionUpdater
-   *   A extension updater object, with test-only modifications.
-   */
-  protected function createExtensionUpdater(): TestExtensionUpdater {
-    return new TestExtensionUpdater(
-      $this->container->get('config.factory'),
-      $this->container->get('package_manager.path_locator'),
-      $this->container->get('package_manager.beginner'),
-      $this->container->get('package_manager.stager'),
-      $this->container->get('package_manager.committer'),
-      $this->container->get('file_system'),
-      $this->container->get('event_dispatcher'),
-      $this->container->get('tempstore.shared'),
-      $this->container->get('datetime.time')
-    );
-  }
-
-}
-
-/**
- * A test-only version of the regular extension updater to override internals.
- */
-class TestExtensionUpdater extends ExtensionUpdater {
-
-  use TestStageTrait;
-
 }

automatic_updates_extensions/tests/src/Kernel/Validator/ForbidCoreChangesValidatorTest.php

+<?php
+
+namespace Drupal\Tests\automatic_updates_extensions\Kernel\Validator;
+
+use Drupal\automatic_updates_extensions\ExtensionUpdateStage;
+use Drupal\package_manager\Exception\StageEventException;
+use Drupal\package_manager\ValidationResult;
+use Drupal\Tests\automatic_updates_extensions\Kernel\AutomaticUpdatesExtensionsKernelTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\automatic_updates_extensions\Validator\ForbidCoreChangesValidator
+ * @group automatic_updates_extensions
+ * @internal
+ */
+class ForbidCoreChangesValidatorTest extends AutomaticUpdatesExtensionsKernelTestBase {
+
+  /**
+   * Tests error messages if requested updates were not staged.
+   *
+   * @param array $staged_versions
+   *   An array of the staged versions where the keys are the package names and
+   *   the values are the package versions or NULL if the package should be
+   *   removed in the stage.
+   * @param string[][] $new_packages
+   *   An array of the new packages to add to the stage.
+   * @param \Drupal\package_manager\ValidationResult[] $expected_results
+   *   The expected validation results.
+   *
+   * @dataProvider providerTestErrorMessage
+   */
+  public function testErrorMessages(array $staged_versions, array $new_packages, array $expected_results): void {
+    $this->setReleaseMetadata([
+      'semver_test' => __DIR__ . '/../../../fixtures/release-history/semver_test.1.1.xml',
+      'drupal' => __DIR__ . '/../../../../../package_manager/tests/fixtures/release-history/drupal.9.8.2.xml',
+    ]);
+    $this->getStageFixtureManipulator()->addPackage([
+      'name' => 'drupal/non-core',
+      'version' => '1.0.0',
+      'type' => 'package',
+    ]);
+
+    foreach ($staged_versions as $package => $version) {
+      if ($version === NULL) {
+        $this->getStageFixtureManipulator()->removePackage($package);
+        continue;
+      }
+      $this->getStageFixtureManipulator()->setVersion($package, $version);
+    }
+    foreach ($new_packages as $package) {
+      $this->getStageFixtureManipulator()->addPackage($package);
+    }
+    $this->getStageFixtureManipulator()->setVersion('drupal/semver_test', '8.1.1');
+
+    $stage = $this->container->get(ExtensionUpdateStage::class);
+    $stage->begin([
+      'semver_test' => '8.1.1',
+    ]);
+    $stage->stage();
+    $this->assertStatusCheckResults($expected_results, $stage);
+    try {
+      $stage->apply();
+      $this->fail('Expecting an exception.');
+    }
+    catch (StageEventException $exception) {
+      $this->assertExpectedResultsFromException($expected_results, $exception);
+    }
+  }
+
+  /**
+   * Data provider for testErrorMessage().
+   *
+   * @return mixed[]
+   *   The test cases.
+   */
+  public function providerTestErrorMessage(): array {
+    $summary = t('Updating Drupal Core while updating extensions is currently not supported. Use <a href="/admin/reports/updates/update">this form</a> to update Drupal core. The following changes were made to the Drupal core packages:');
+    return [
+      'drupal/core updated, non-core updated' => [
+        [
+          'drupal/core' => '9.8.1',
+          'drupal/non-core' => '1.0.1',
+        ],
+        [],
+        [ValidationResult::createError([t("'drupal/core' version changed from 9.8.0 to 9.8.1.")], $summary)],
+      ],
+      'drupal/core-recommended and drupal/core updated, non-core package installed' => [
+        [
+          'drupal/core-recommended' => '9.8.1',
+          'drupal/core' => '9.8.1',
+        ],
+        [
+          [
+            'name' => 'other-org/other-package',
+            'type' => 'package',
+          ],
+        ],
+        [
+          ValidationResult::createError(
+            [
+              t("'drupal/core-recommended' version changed from 9.8.0 to 9.8.1."),
+              t("'drupal/core' version changed from 9.8.0 to 9.8.1."),
+            ],
+            $summary
+          ),
+        ],
+      ],
+      'drupal/core-recommended removed, drupal/core updated, drupal/core-composer-scaffold installed, non-core package removed' => [
+        [
+          'drupal/core-recommended' => NULL,
+          'drupal/core' => '9.8.1',
+          'drupal/non-core' => NULL,
+        ],
+        [
+          [
+            'name' => 'drupal/core-composer-scaffold',
+            'type' => 'package',
+          ],
+        ],
+        [
+          ValidationResult::createError(
+            [
+              t("'drupal/core-composer-scaffold' installed."),
+              t("'drupal/core-recommended' removed."),
+              t("'drupal/core' version changed from 9.8.0 to 9.8.1."),
+            ],
+            $summary
+          ),
+        ],
+      ],
+    ];
+  }
+
+}