Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / update / tests / src / Functional / UpdateUploadTest.php

diff --git a/web/core/modules/update/src/Tests/UpdateUploadTest.php b/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
similarity index 96%
rename from web/core/modules/update/src/Tests/UpdateUploadTest.php
rename to web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
index 80d3f15d29f0ebd69e1fe63cc677241e69e4c49e..60966200629f20e1fe3f1d024f9e816d31c33042 100644 (file)
--- a/web/core/modules/update/src/Tests/UpdateUploadTest.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Drupal\update\Tests;
+namespace Drupal\Tests\update\Functional;
 
 use Drupal\Core\Extension\InfoParserDynamic;
 use Drupal\Core\Updater\Updater;
 use Drupal\Core\Url;
+use Drupal\Tests\TestFileCreationTrait;
 
 /**
  * Tests the Update Manager module's upload and extraction functionality.
@@ -13,6 +14,10 @@ use Drupal\Core\Url;
  */
 class UpdateUploadTest extends UpdateTestBase {
 
+  use TestFileCreationTrait {
+    getTestFiles as drupalGetTestFiles;
+  }
+
   /**
    * Modules to enable.
    *
@@ -50,7 +55,7 @@ class UpdateUploadTest extends UpdateTestBase {
     // Check to ensure an existing module can't be reinstalled. Also checks that
     // the archive was extracted since we can't know if the module is already
     // installed until after extraction.
-    $validArchiveFile = __DIR__ . '/../../tests/aaa_update_test.tar.gz';
+    $validArchiveFile = __DIR__ . '/../../aaa_update_test.tar.gz';
     $edit = [
       'files[project_upload]' => $validArchiveFile,
     ];
@@ -63,7 +68,7 @@ class UpdateUploadTest extends UpdateTestBase {
     $moduleUpdater = $updaters['module']['class'];
     $installedInfoFilePath = $this->container->get('update.root') . '/' . $moduleUpdater::getRootDirectoryRelativePath() . '/update_test_new_module/update_test_new_module.info.yml';
     $this->assertFalse(file_exists($installedInfoFilePath), 'The new module does not exist in the filesystem before it is installed with the Update Manager.');
-    $validArchiveFile = __DIR__ . '/../../tests/update_test_new_module/8.x-1.0/update_test_new_module.tar.gz';
+    $validArchiveFile = __DIR__ . '/../../update_test_new_module/8.x-1.0/update_test_new_module.tar.gz';
     $edit = [
       'files[project_upload]' => $validArchiveFile,
     ];