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 568a73a70efbaf2a382c41713f6dce18112039b5..e97a11e64e795aa4b92456ea05c3dfb9cfa49f1d 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 6e76fccf3248abff7890970e27288ad5cbc5858d..5cdd3a1729d965e3f66f16b1e0e3f415f0e2340b 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 4b8f2a6cfe46236f70e981e2295f9c0dad449a95..2edd328b279ab4e11ed32654ea4a38862373959d 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 9864fa68311ef59fc0d59b6ff9ef9fcdb80af5ad..a33217eff639c1e3e321dd90b40f94f108a82fa1 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(); }