Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / file / tests / src / Kernel / UsageTest.php

diff --git a/web/core/modules/file/tests/src/Kernel/UsageTest.php b/web/core/modules/file/tests/src/Kernel/UsageTest.php
index 672de0fb5a8f8a166009cce49ef481b20886f597..f95e9cd488219cbeec21661d45aa17733747255c 100644 (file)
--- a/web/core/modules/file/tests/src/Kernel/UsageTest.php
+++ b/web/core/modules/file/tests/src/Kernel/UsageTest.php
@@ -74,11 +74,34 @@ class UsageTest extends FileManagedUnitTestBase {
     $this->assertEqual($usage[2]->count, 2, 'Correct count');
   }
 
+  /**
+   * Tests file usage deletion when files are made temporary.
+   */
+  public function testRemoveUsageTemporary() {
+    $this->config('file.settings')
+      ->set('make_unused_managed_files_temporary', TRUE)
+      ->save();
+    $file = $this->doTestRemoveUsage();
+    $this->assertTrue($file->isTemporary());
+  }
+
+  /**
+   * Tests file usage deletion when files are made temporary.
+   */
+  public function testRemoveUsageNonTemporary() {
+    $this->config('file.settings')
+      ->set('make_unused_managed_files_temporary', FALSE)
+      ->save();
+    $file = $this->doTestRemoveUsage();
+    $this->assertFalse($file->isTemporary());
+  }
+
   /**
    * Tests \Drupal\file\FileUsage\DatabaseFileUsageBackend::delete().
    */
-  public function testRemoveUsage() {
+  public function doTestRemoveUsage() {
     $file = $this->createFile();
+    $file->setPermanent();
     $file_usage = $this->container->get('file.usage');
     db_insert('file_usage')
       ->fields([
@@ -116,6 +139,7 @@ class UsageTest extends FileManagedUnitTestBase {
       ->execute()
       ->fetchField();
     $this->assertIdentical(FALSE, $count, 'Decrementing non-exist record complete.');
+    return $file;
   }
 
   /**