Merge "maintenance: Remove cross-wiki purging from rebuildmessages.php"

[lhc/web/wiklou.git] / tests / phpunit / includes / libs / CSSMinTest.php

diff --git a/tests/phpunit/includes/libs/CSSMinTest.php b/tests/phpunit/includes/libs/CSSMinTest.php
index ef333f9..34837c7 100644 (file)
--- a/tests/phpunit/includes/libs/CSSMinTest.php
+++ b/tests/phpunit/includes/libs/CSSMinTest.php
@@ -85,9 +85,9 @@ class CSSMinTest extends MediaWikiTestCase {
         * @covers CSSMin::getMimeType
         */
        public function testGetMimeType( $fileContents, $fileExtension, $expected ) {
-               $fileName = wfTempDir() . DIRECTORY_SEPARATOR . uniqid( 'MW_PHPUnit_CSSMinTest_' ) . '.'
-                       . $fileExtension;
-               $this->addTmpFiles( $fileName );
+               // Automatically removed when it falls out of scope (including if the test fails)
+               $file = TempFSFile::factory( 'PHPUnit_CSSMinTest_', $fileExtension, wfTempDir() );
+               $fileName = $file->getPath();
                file_put_contents( $fileName, $fileContents );
                $this->assertSame( $expected, CSSMin::getMimeType( $fileName ) );
        }
@@ -333,7 +333,7 @@ class CSSMinTest extends MediaWikiTestCase {
         * Cases with empty url() for CSSMin::remap.
         *
         * Regression test for T191237.
-   *
+        *
         * @dataProvider provideRemapEmptyUrl
         * @covers CSSMin
         */