From 61aba172038a33aec8c2ed14abb888040d44fab4 Mon Sep 17 00:00:00 2001
From: "Theresa.Grannum" <theresa.grannum@3688861.no-reply.drupal.org>
Date: Tue, 12 Apr 2022 13:12:21 +0000
Subject: [PATCH] Issue #3274633 by Theresa.Grannum, tedbow: Move semver test
to new directory
---
.../tests}/fixtures/release-history/semver_test.1.1.xml | 0
.../tests/src/Functional/UpdaterFormTest.php | 2 +-
.../src/TestController.php | 7 +++----
tests/src/Build/CoreUpdateTest.php | 2 +-
.../src/Functional/AutomaticUpdatesFunctionalTestBase.php | 4 ++--
5 files changed, 7 insertions(+), 8 deletions(-)
rename {tests => automatic_updates_extensions/tests}/fixtures/release-history/semver_test.1.1.xml (100%)
diff --git a/tests/fixtures/release-history/semver_test.1.1.xml b/automatic_updates_extensions/tests/fixtures/release-history/semver_test.1.1.xml
similarity index 100%
rename from tests/fixtures/release-history/semver_test.1.1.xml
rename to automatic_updates_extensions/tests/fixtures/release-history/semver_test.1.1.xml
diff --git a/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php b/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php
index 568a73a70e..e97a11e64e 100644
--- a/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php
+++ b/automatic_updates_extensions/tests/src/Functional/UpdaterFormTest.php
@@ -44,7 +44,7 @@ class UpdaterFormTest extends AutomaticUpdatesFunctionalTestBase {
*/
protected function setUp(): void {
parent::setUp();
- $this->setReleaseMetadata(__DIR__ . '/../../../../tests/fixtures/release-history/semver_test.1.1.xml');
+ $this->setReleaseMetadata(__DIR__ . '/../../fixtures/release-history/semver_test.1.1.xml');
$this->drupalLogin($this->rootUser);
$this->drupalPlaceBlock('local_tasks_block', ['primary' => TRUE]);
}
diff --git a/tests/modules/automatic_updates_test_release_history/src/TestController.php b/tests/modules/automatic_updates_test_release_history/src/TestController.php
index 6e76fccf32..5cdd3a1729 100644
--- a/tests/modules/automatic_updates_test_release_history/src/TestController.php
+++ b/tests/modules/automatic_updates_test_release_history/src/TestController.php
@@ -19,10 +19,10 @@ class TestController extends ControllerBase {
public function metadata($project_name = 'drupal', $version = NULL): Response {
$xml_map = $this->config('update_test.settings')->get('xml_map');
if (isset($xml_map[$project_name])) {
- $availability_scenario = $xml_map[$project_name];
+ $file = $xml_map[$project_name];
}
elseif (isset($xml_map['#all'])) {
- $availability_scenario = $xml_map['#all'];
+ $file = $xml_map['#all'];
}
else {
// The test didn't specify (for example, the webroot has other modules and
@@ -30,10 +30,9 @@ class TestController extends ControllerBase {
// running the test. So, we default to a file we know won't exist, so at
// least we'll get an empty xml response instead of a bunch of Drupal page
// output.
- $availability_scenario = '#broken#';
+ $file = '#broken#';
}
- $file = __DIR__ . "/../../../fixtures/release-history/$project_name.$availability_scenario.xml";
$headers = ['Content-Type' => 'text/xml; charset=utf-8'];
if (!is_file($file)) {
// Return an empty response.
diff --git a/tests/src/Build/CoreUpdateTest.php b/tests/src/Build/CoreUpdateTest.php
index 4b8f2a6cfe..2edd328b27 100644
--- a/tests/src/Build/CoreUpdateTest.php
+++ b/tests/src/Build/CoreUpdateTest.php
@@ -43,7 +43,7 @@ class CoreUpdateTest extends UpdateTestBase {
// referenced in our fake release metadata (see
// fixtures/release-history/drupal.0.0.xml).
$this->setUpstreamCoreVersion('9.8.1');
- $this->setReleaseMetadata(['drupal' => '9.8.1-security']);
+ $this->setReleaseMetadata(['drupal' => __DIR__ . '/../../fixtures/release-history/drupal.9.8.1-security.xml']);
// Ensure that Drupal thinks we are running 9.8.0, then refresh information
// about available updates and ensure that an update to 9.8.1 is available.
diff --git a/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php b/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php
index 9864fa6831..a33217eff6 100644
--- a/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php
+++ b/tests/src/Functional/AutomaticUpdatesFunctionalTestBase.php
@@ -135,10 +135,10 @@ abstract class AutomaticUpdatesFunctionalTestBase extends BrowserTestBase {
->set('fetch.url', $this->baseUrl . '/test-release-history')
->save();
- [$project, $fixture] = explode('.', basename($file, '.xml'), 2);
+ [$project] = explode('.', basename($file, '.xml'), 2);
$this->config('update_test.settings')
->set('xml_map', [
- $project => $fixture,
+ $project => $file,
])
->save();
}
--
GitLab