From f4c7499b854560635dd6edda5fedbb4213844fd6 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Wed, 24 Jan 2024 22:46:15 +0000
Subject: [PATCH] Issue #3416071 by catch: Consolidate one more jsonapi invalid
 file upload test method

---
 .../jsonapi/tests/src/Functional/FileUploadTest.php        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php b/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
index 4ccf903d27c3..d028d0949920 100644
--- a/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
@@ -521,6 +521,7 @@ public function testInvalidFileUploads() {
     \Drupal::service('router.builder')->rebuild();
     $this->setUpAuthorization('POST');
     $this->config('jsonapi.settings')->set('read_only', FALSE)->save(TRUE);
+    $this->testFileUploadInvalidFileType();
     $this->testPostFileUploadInvalidHeaders();
     $this->testFileUploadLargerFileSize();
     $this->testFileUploadMaliciousExtension();
@@ -570,11 +571,7 @@ public function testFileUploadZeroByteFile() {
   /**
    * Tests using the file upload route with an invalid file type.
    */
-  public function testFileUploadInvalidFileType() {
-    \Drupal::service('router.builder')->rebuild();
-    $this->setUpAuthorization('POST');
-    $this->config('jsonapi.settings')->set('read_only', FALSE)->save(TRUE);
-
+  protected function testFileUploadInvalidFileType() {
     $uri = Url::fromUri('base:' . static::$postUri);
 
     // Test with a JSON file.
-- 
GitLab