From 1fdd465249d2aa6f45f511f45fff7e1ddf615f48 Mon Sep 17 00:00:00 2001
From: "Theresa.Grannum" <theresa.grannum@3688861.no-reply.drupal.org>
Date: Tue, 27 Sep 2022 22:20:13 +0000
Subject: [PATCH] Issue #3311020 by Theresa.Grannum, phenaproxima: Rename
staged/9.8.1 to something clearer
---
.../9.8.1 => drupal-9.8.1-installed}/composer.json | 0
.../9.8.1 => drupal-9.8.1-installed}/composer.lock | 0
.../vendor/composer/installed.json | 0
.../vendor/composer/installed.php | 0
tests/src/Functional/ReadinessValidationTest.php | 2 +-
tests/src/Functional/UpdateLockTest.php | 2 +-
tests/src/Functional/UpdaterFormTest.php | 10 +++++-----
7 files changed, 7 insertions(+), 7 deletions(-)
rename tests/fixtures/{staged/9.8.1 => drupal-9.8.1-installed}/composer.json (100%)
rename tests/fixtures/{staged/9.8.1 => drupal-9.8.1-installed}/composer.lock (100%)
rename tests/fixtures/{staged/9.8.1 => drupal-9.8.1-installed}/vendor/composer/installed.json (100%)
rename tests/fixtures/{staged/9.8.1 => drupal-9.8.1-installed}/vendor/composer/installed.php (100%)
diff --git a/tests/fixtures/staged/9.8.1/composer.json b/tests/fixtures/drupal-9.8.1-installed/composer.json
similarity index 100%
rename from tests/fixtures/staged/9.8.1/composer.json
rename to tests/fixtures/drupal-9.8.1-installed/composer.json
diff --git a/tests/fixtures/staged/9.8.1/composer.lock b/tests/fixtures/drupal-9.8.1-installed/composer.lock
similarity index 100%
rename from tests/fixtures/staged/9.8.1/composer.lock
rename to tests/fixtures/drupal-9.8.1-installed/composer.lock
diff --git a/tests/fixtures/staged/9.8.1/vendor/composer/installed.json b/tests/fixtures/drupal-9.8.1-installed/vendor/composer/installed.json
similarity index 100%
rename from tests/fixtures/staged/9.8.1/vendor/composer/installed.json
rename to tests/fixtures/drupal-9.8.1-installed/vendor/composer/installed.json
diff --git a/tests/fixtures/staged/9.8.1/vendor/composer/installed.php b/tests/fixtures/drupal-9.8.1-installed/vendor/composer/installed.php
similarity index 100%
rename from tests/fixtures/staged/9.8.1/vendor/composer/installed.php
rename to tests/fixtures/drupal-9.8.1-installed/vendor/composer/installed.php
diff --git a/tests/src/Functional/ReadinessValidationTest.php b/tests/src/Functional/ReadinessValidationTest.php
index 3e646fb882..fd63cc6d87 100644
--- a/tests/src/Functional/ReadinessValidationTest.php
+++ b/tests/src/Functional/ReadinessValidationTest.php
@@ -423,7 +423,7 @@ class ReadinessValidationTest extends AutomaticUpdatesFunctionalTestBase {
// readiness check (without storing the results), and the checker is no
// longer raising an error.
$this->drupalGet('/admin/modules/automatic-update');
- $this->useFixtureDirectoryAsStaged(__DIR__ . '/../../fixtures/staged/9.8.1');
+ $this->useFixtureDirectoryAsStaged(__DIR__ . '/../../fixtures/drupal-9.8.1-installed');
$assert_session->buttonExists('Update');
// Ensure that the previous results are still displayed on another admin
// page, to confirm that the updater form is not discarding the previous
diff --git a/tests/src/Functional/UpdateLockTest.php b/tests/src/Functional/UpdateLockTest.php
index 3b0df121b4..48ae0aa3d6 100644
--- a/tests/src/Functional/UpdateLockTest.php
+++ b/tests/src/Functional/UpdateLockTest.php
@@ -52,7 +52,7 @@ class UpdateLockTest extends AutomaticUpdatesFunctionalTestBase {
// We should be able to get partway through an update without issue.
$this->drupalLogin($user_1);
$this->drupalGet('/admin/modules/automatic-update');
- Stager::setFixturePath(__DIR__ . '/../../fixtures/staged/9.8.1');
+ Stager::setFixturePath(__DIR__ . '/../../fixtures/drupal-9.8.1-installed');
$page->pressButton('Update');
$this->checkForMetaRefresh();
$this->assertUpdateReady('9.8.1');
diff --git a/tests/src/Functional/UpdaterFormTest.php b/tests/src/Functional/UpdaterFormTest.php
index 9ec691072e..69bc89a426 100644
--- a/tests/src/Functional/UpdaterFormTest.php
+++ b/tests/src/Functional/UpdaterFormTest.php
@@ -386,7 +386,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
$this->checkForUpdates();
$this->drupalGet('/admin/modules/automatic-update');
- Stager::setFixturePath(__DIR__ . '/../../fixtures/staged/9.8.1');
+ Stager::setFixturePath(__DIR__ . '/../../fixtures/drupal-9.8.1-installed');
$page->pressButton('Update to 9.8.1');
$this->checkForMetaRefresh();
$this->assertUpdateStagedTimes(1);
@@ -521,7 +521,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
$page = $this->getSession()->getPage();
$this->drupalGet('/admin/modules/automatic-update');
- Stager::setFixturePath(__DIR__ . '/../../fixtures/staged/9.8.1');
+ Stager::setFixturePath(__DIR__ . '/../../fixtures/drupal-9.8.1-installed');
// The warning should be visible.
$assert_session = $this->assertSession();
$assert_session->pageTextContains(reset($messages));
@@ -629,7 +629,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
$cached_message = $this->setAndAssertCachedMessage();
$this->drupalGet($update_form_url);
- Stager::setFixturePath(__DIR__ . '/../../fixtures/staged/9.8.1');
+ Stager::setFixturePath(__DIR__ . '/../../fixtures/drupal-9.8.1-installed');
$assert_session->pageTextNotContains($cached_message);
$page->pressButton('Update to 9.8.1');
$this->checkForMetaRefresh();
@@ -687,7 +687,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
$page = $this->getSession()->getPage();
$this->drupalGet('/admin/modules/automatic-update');
- Stager::setFixturePath(__DIR__ . '/../../fixtures/staged/9.8.1');
+ Stager::setFixturePath(__DIR__ . '/../../fixtures/drupal-9.8.1-installed');
$page->pressButton('Update to 9.8.1');
$this->checkForMetaRefresh();
// Confirm that the site was put into maintenance mode if needed.
@@ -708,7 +708,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
$page = $this->getSession()->getPage();
$this->drupalGet('/admin/modules/automatic-update');
- Stager::setFixturePath(__DIR__ . '/../../fixtures/staged/9.8.1');
+ Stager::setFixturePath(__DIR__ . '/../../fixtures/drupal-9.8.1-installed');
$page->pressButton('Update to 9.8.1');
$this->checkForMetaRefresh();
$this->assertUpdateStagedTimes(1);
--
GitLab