From 58bdab138052007964fdce160833bc1ef101fbe5 Mon Sep 17 00:00:00 2001
From: Si Hobbs <38379-sime@users.noreply.drupalcode.org>
Date: Thu, 27 Jun 2024 16:50:30 +0000
Subject: [PATCH] Issue #3455220 by sime, phenaproxima, chrisfromredfin: [REDO}
Resolve technical debt in initPackageManager()
---
.../ProjectBrowserInstallerUiTest.php | 3 +++
.../Traits/PackageManagerFixtureUtilityTrait.php | 16 ----------------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/tests/src/FunctionalJavascript/ProjectBrowserInstallerUiTest.php b/tests/src/FunctionalJavascript/ProjectBrowserInstallerUiTest.php
index 6f7d49f23..020e26428 100644
--- a/tests/src/FunctionalJavascript/ProjectBrowserInstallerUiTest.php
+++ b/tests/src/FunctionalJavascript/ProjectBrowserInstallerUiTest.php
@@ -34,6 +34,9 @@ class ProjectBrowserInstallerUiTest extends WebDriverTestBase {
* {@inheritdoc}
*/
protected static $modules = [
+ 'package_manager_bypass',
+ 'package_manager',
+ 'package_manager_test_validation',
'project_browser',
'project_browser_test',
];
diff --git a/tests/src/Traits/PackageManagerFixtureUtilityTrait.php b/tests/src/Traits/PackageManagerFixtureUtilityTrait.php
index ed77fa623..7c10dfeef 100644
--- a/tests/src/Traits/PackageManagerFixtureUtilityTrait.php
+++ b/tests/src/Traits/PackageManagerFixtureUtilityTrait.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Drupal\Tests\project_browser\Traits;
-use Drupal\Core\Extension\MissingDependencyException;
use Drupal\package_manager\PathLocator;
use Symfony\Component\Filesystem\Filesystem;
@@ -23,21 +22,6 @@ trait PackageManagerFixtureUtilityTrait {
* Initializes Package Manager.
*/
protected function initPackageManager(): void {
- // @todo Move back to static::$modules in https://www.drupal.org/i/3349193.
- $modules = [
- 'package_manager_bypass',
- 'package_manager',
- 'package_manager_test_validation',
- ];
- try {
- $this->container->get('module_installer')->install($modules);
- // The container was rebuilt by the ModuleInstaller.
- $this->container = \Drupal::getContainer();
- }
- catch (MissingDependencyException $e) {
- $this->markTestSkipped($e->getMessage());
- }
-
$pm_path = $this->container->get('extension.list.module')->getPath('package_manager');
$this->useFixtureDirectoryAsActive($pm_path . '/tests/fixtures/fake_site');
}
--
GitLab