From 58fd3ffae2d645358da762cfbb1dae799657c8f4 Mon Sep 17 00:00:00 2001
From: "kunal.sachdev" <kunal.sachdev@3685163.no-reply.drupal.org>
Date: Wed, 16 Nov 2022 18:31:45 +0000
Subject: [PATCH] Issue #3318625 by kunal.sachdev, tedbow, Wim Leers: Remove
active composer fixture files in UpdaterFormTest
---
.../tests/fixtures/no_project/composer.json | 7 ----
.../tests/fixtures/no_project/composer.lock | 11 ------
.../no_project/vendor/composer/installed.json | 14 -------
.../tests/fixtures/one_project/composer.json | 7 ----
.../tests/fixtures/one_project/composer.lock | 15 --------
.../vendor/composer/installed.json | 19 ----------
.../tests/fixtures/two_projects/composer.json | 7 ----
.../tests/fixtures/two_projects/composer.lock | 23 ------------
.../vendor/composer/installed.json | 29 ---------------
.../vendor/composer/installed.php | 23 ------------
.../tests/src/Functional/UpdaterFormTest.php | 37 ++++++++++++++++---
11 files changed, 31 insertions(+), 161 deletions(-)
delete mode 100644 automatic_updates_extensions/tests/fixtures/no_project/composer.json
delete mode 100644 automatic_updates_extensions/tests/fixtures/no_project/composer.lock
delete mode 100644 automatic_updates_extensions/tests/fixtures/no_project/vendor/composer/installed.json
delete mode 100644 automatic_updates_extensions/tests/fixtures/one_project/composer.json
delete mode 100644 automatic_updates_extensions/tests/fixtures/one_project/composer.lock
delete mode 100644 automatic_updates_extensions/tests/fixtures/one_project/vendor/composer/installed.json
delete mode 100644 automatic_updates_extensions/tests/fixtures/two_projects/composer.json
delete mode 100644 automatic_updates_extensions/tests/fixtures/two_projects/composer.lock
delete mode 100644 automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.json
delete mode 100644 automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.php
diff --git a/automatic_updates_extensions/tests/fixtures/no_project/composer.json b/automatic_updates_extensions/tests/fixtures/no_project/composer.json
deleted file mode 100644
index ea020c5754..0000000000
--- a/automatic_updates_extensions/tests/fixtures/no_project/composer.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "extra": {
- "_readme": [
- "This fixture simulates a active directory in which, according to Composer, no module is installed."
- ]
- }
-}
diff --git a/automatic_updates_extensions/tests/fixtures/no_project/composer.lock b/automatic_updates_extensions/tests/fixtures/no_project/composer.lock
deleted file mode 100644
index a453560509..0000000000
--- a/automatic_updates_extensions/tests/fixtures/no_project/composer.lock
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "packages": [
- {
- "name": "drupal/core-recommended",
- "version": "9.8.0",
- "require": {
- "drupal/core": "9.8.0"
- }
- }
- ]
-}
diff --git a/automatic_updates_extensions/tests/fixtures/no_project/vendor/composer/installed.json b/automatic_updates_extensions/tests/fixtures/no_project/vendor/composer/installed.json
deleted file mode 100644
index d4f0f343d7..0000000000
--- a/automatic_updates_extensions/tests/fixtures/no_project/vendor/composer/installed.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "packages": [
- {
- "name": "drupal/core",
- "version": "9.8.1",
- "type": "drupal-core",
- "extra": {
- "drupal-scaffold": {
- "file-mapping": {}
- }
- }
- }
- ]
-}
diff --git a/automatic_updates_extensions/tests/fixtures/one_project/composer.json b/automatic_updates_extensions/tests/fixtures/one_project/composer.json
deleted file mode 100644
index 9e02b7d513..0000000000
--- a/automatic_updates_extensions/tests/fixtures/one_project/composer.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "extra": {
- "_readme": [
- "This fixture simulates a active directory in which, according to Composer, semver_test is installed."
- ]
- }
-}
diff --git a/automatic_updates_extensions/tests/fixtures/one_project/composer.lock b/automatic_updates_extensions/tests/fixtures/one_project/composer.lock
deleted file mode 100644
index eb940f5c35..0000000000
--- a/automatic_updates_extensions/tests/fixtures/one_project/composer.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "packages": [
- {
- "name": "drupal/core-recommended",
- "version": "9.8.0",
- "require": {
- "drupal/core": "9.8.0"
- }
- },
- {
- "name": "drupal/semver_test",
- "version": "9.8.1"
- }
- ]
-}
diff --git a/automatic_updates_extensions/tests/fixtures/one_project/vendor/composer/installed.json b/automatic_updates_extensions/tests/fixtures/one_project/vendor/composer/installed.json
deleted file mode 100644
index d3abd4518c..0000000000
--- a/automatic_updates_extensions/tests/fixtures/one_project/vendor/composer/installed.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "packages": [
- {
- "name": "drupal/core",
- "version": "9.8.1",
- "type": "drupal-core",
- "extra": {
- "drupal-scaffold": {
- "file-mapping": {}
- }
- }
- },
- {
- "name": "drupal/semver_test",
- "version": "9.8.1",
- "type": "drupal-module"
- }
- ]
-}
diff --git a/automatic_updates_extensions/tests/fixtures/two_projects/composer.json b/automatic_updates_extensions/tests/fixtures/two_projects/composer.json
deleted file mode 100644
index 2981dea83e..0000000000
--- a/automatic_updates_extensions/tests/fixtures/two_projects/composer.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "extra": {
- "_readme": [
- "This fixture simulates a active directory in which, according to Composer, semver_test and aaa_update_test are installed."
- ]
- }
-}
diff --git a/automatic_updates_extensions/tests/fixtures/two_projects/composer.lock b/automatic_updates_extensions/tests/fixtures/two_projects/composer.lock
deleted file mode 100644
index 57457e08cd..0000000000
--- a/automatic_updates_extensions/tests/fixtures/two_projects/composer.lock
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "packages": [
- {
- "name": "drupal/core-recommended",
- "version": "9.8.0",
- "require": {
- "drupal/core": "9.8.0"
- }
- },
- {
- "name": "drupal/semver_test",
- "version": "9.8.1"
- },
- {
- "name": "drupal/aaa_update_test",
- "version": "9.8.1"
- },
- {
- "name": "drupal/automatic_updates_extensions_test_theme",
- "version": "9.8.1"
- }
- ]
-}
diff --git a/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.json b/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.json
deleted file mode 100644
index 436721dfab..0000000000
--- a/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "packages": [
- {
- "name": "drupal/core",
- "version": "9.8.1",
- "type": "drupal-core",
- "extra": {
- "drupal-scaffold": {
- "file-mapping": {}
- }
- }
- },
- {
- "name": "drupal/semver_test",
- "version": "8.1.0",
- "type": "drupal-module"
- },
- {
- "name": "drupal/aaa_update_test",
- "version": "2.0.0",
- "type": "drupal-module"
- },
- {
- "name": "drupal/automatic_updates_extensions_test_theme",
- "version": "2.0.0",
- "type": "drupal-theme"
- }
- ]
-}
diff --git a/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.php b/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.php
deleted file mode 100644
index ab1ddd069b..0000000000
--- a/automatic_updates_extensions/tests/fixtures/two_projects/vendor/composer/installed.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * @file
- */
-
-$projects_dir = __DIR__ . '/../../web/projects';
-return [
- 'versions' => [
- 'drupal/automatic_updates_extensions_test_theme' => [
- 'type' => 'drupal-theme',
- 'install_path' => $projects_dir . '/automatic_updates_extensions_test_theme',
- ],
- 'drupal/semver_test' => [
- 'type' => 'drupal-module',
- 'install_path' => $projects_dir . '/semver_test',
- ],
- 'drupal/aaa_update_test' => [
- 'type' => 'drupal-module',
- 'install_path' => $projects_dir . '/aaa_update_test',
- ],
- ],
-];
diff --git a/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php b/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php
index 524d19f987..d0d4a8fa97 100644
--- a/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php
+++ b/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php
@@ -13,6 +13,7 @@ use Drupal\package_manager_test_validation\EventSubscriber\TestSubscriber;
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\FixtureUtilityTrait;
use Drupal\Tests\package_manager\Traits\PackageManagerBypassTestTrait;
/**
@@ -25,6 +26,14 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
use ValidationTestTrait;
use FormTestTrait;
use PackageManagerBypassTestTrait;
+ use FixtureUtilityTrait;
+
+ /**
+ * The path of the test project's active directory.
+ *
+ * @var string
+ */
+ private $activeDir;
/**
* {@inheritdoc}
@@ -75,9 +84,26 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
'access site in maintenance mode',
'access administration pages',
]);
- // We need this fixture as only projects installed via composer will show up
- // on the form.
- $this->useFixtureDirectoryAsActive(__DIR__ . '/../../fixtures/two_projects');
+ $this->activeDir = $this->container->get('package_manager.path_locator')->getProjectRoot();
+ $this->copyFixtureFilesTo(__DIR__ . '/../../fixtures/two_projects', $this->activeDir);
+ $this->addPackage($this->activeDir, [
+ 'name' => 'drupal/semver_test',
+ 'version' => '8.1.0',
+ 'type' => 'drupal-module',
+ 'install_path' => '../../web/projects/semver_test',
+ ]);
+ $this->addPackage($this->activeDir, [
+ 'name' => 'drupal/aaa_update_test',
+ 'version' => '2.0.0',
+ 'type' => 'drupal-module',
+ 'install_path' => '../../web/projects/aaa_update_test',
+ ]);
+ $this->addPackage($this->activeDir, [
+ 'name' => 'drupal/automatic_updates_extensions_test_theme',
+ 'version' => '2.0.0',
+ 'type' => 'drupal-theme',
+ 'install_path' => '../../web/projects/automatic_updates_extensions_test_theme',
+ ]);
$this->drupalLogin($user);
$this->drupalPlaceBlock('local_tasks_block', ['primary' => TRUE]);
}
@@ -418,9 +444,8 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
'semver_test' => '8.1.0',
]
);
-
// One module not installed through composer.
- $this->useFixtureDirectoryAsActive(__DIR__ . '/../../fixtures/one_project');
+ $this->removePackage($this->activeDir, 'drupal/aaa_update_test');
$assert = $this->assertSession();
$user = $this->createUser(
[
@@ -436,7 +461,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
$this->assertUpdatesCount(1);
// Both of the modules not installed through composer.
- $this->useFixtureDirectoryAsActive(__DIR__ . '/../../fixtures/no_project');
+ $this->removePackage($this->activeDir, 'drupal/semver_test');
$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();
--
GitLab