Changeset 46822 for trunk/tests/phpunit/tests/functions.php

Timestamp:

12/06/2019 10:26:19 PM (5 years ago)

Author:

azaozz

Message:

Upload: fix wp_unique_filename() to prevent name collisions with existing or future image sub-size file names, and add unit tests.

Props Viper007Bond, pbiron, azaozz.
Fixes #42437.

File:

• trunk/tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/tests/phpunit/tests/functions.php

@@ -194 +194 @@
         $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\\fg.png' ), 'Double slashed not removed' );
         $this->assertEquals( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\\\fg.png' ), 'Tripple slashed not removed' );
+    }
+
+    /**
+     * @group 42437
+     */
+    function test_unique_filename_with_dimension_like_filename() {
+        $testdir = DIR_TESTDATA . '/images/';
+
+        // Test collision with "dimension-like" original filename.
+        $this->assertEquals( 'one-blue-pixel-100x100-1.png', wp_unique_filename( $testdir, 'one-blue-pixel-100x100.png' ) );
+        // Test collision with existing sub-size filename.
+        // Existing files: one-blue-pixel-100x100.png, one-blue-pixel-1-100x100.png.
+        $this->assertEquals( 'one-blue-pixel-2.png', wp_unique_filename( $testdir, 'one-blue-pixel.png' ) );
     }