Changeset 59604

Timestamp:

01/14/2025 03:35:18 PM (20 months ago)

Author:

SergeyBiryukov

Message:

Tests: Restore the environment before performing assertions in download_url() tests.

This aims to avoid affecting other tests in case of failure.

Follow-up to [42773], [51939].

See #62280.

File:

• trunk/tests/phpunit/tests/admin/includesFile.php (modified) (6 diffs)

trunk/tests/phpunit/tests/admin/includesFile.php

@@ -44 +44 @@
 
                 $error = download_url( 'test_download_url_non_200' );
+
                 $this->assertWPError( $error );
                 $this->assertSame(
@@ -56 +57 @@
 
                 $error = download_url( 'test_download_url_non_200' );
+
+                remove_filter( 'download_url_error_max_body_size', array( $this, '__return_5' ) );
+                remove_filter( 'pre_http_request', array( $this, '_fake_download_url_non_200_response_code' ) );
+
                 $this->assertWPError( $error );
                 $this->assertSame(
@@ -64 +69 @@
                         $error->get_error_data()
                 );
-
-                remove_filter( 'download_url_error_max_body_size', array( $this, '__return_5' ) );
-                remove_filter( 'pre_http_request', array( $this, '_fake_download_url_non_200_response_code' ) );
         }
 
@@ -95 +97 @@
 
                 $filename = download_url( 'url_with_content_disposition_header' );
-                $this->assertStringContainsString( 'filename-from-content-disposition-header', $filename );
+
+                remove_filter( 'pre_http_request', array( $this, $filter ) );
+
                 $this->assertFileExists( $filename );
                 $this->unlink( $filename );
 
-                remove_filter( 'pre_http_request', array( $this, $filter ) );
+                $this->assertStringContainsString( 'filename-from-content-disposition-header', $filename );
         }
 
@@ -127 +131 @@
 
                 $filename = download_url( 'url_with_content_disposition_header' );
+
+                remove_filter( 'pre_http_request', array( $this, $filter ) );
+
+                $this->unlink( $filename );
+
                 $this->assertStringContainsString( get_temp_dir(), $filename );
-                $this->unlink( $filename );
-
-                remove_filter( 'pre_http_request', array( $this, $filter ) );
         }
 
@@ -210 +216 @@
 
                 $filename = download_url( 'url_with_content_disposition_header' );
+
+                remove_filter( 'pre_http_request', array( $this, $filter ) );
+
+                $this->unlink( $filename );
+
                 $this->assertStringContainsString( 'url_with_content_disposition_header', $filename );
-                $this->unlink( $filename );
-
-                remove_filter( 'pre_http_request', array( $this, $filter ) );
         }