Changeset 59061

Timestamp:

09/18/2024 09:04:48 PM (2 years ago)

Author:

hellofromTonya

Message:

Tests: Use file paths independent of OS-specifics assertion or helper.

Use WP_UnitTestCase_Base::assertSamePathIgnoringDirectorySeparators() and WP_UnitTestCase_Base::normalizeDirectorySeparatorsInPath() in existing tests.

Follow-up to [59057], [57753], [57215], [56635], [48937], [25002].

Props jrf.
See #61530.

Location:

trunk/tests/phpunit/tests

Files:

• admin/includesFile.php (modified) (1 diff)
• block-template.php (modified) (2 diffs)
• filesystem/wpFilesystemDirect/chdir.php (modified) (1 diff)
• theme.php (modified) (2 diffs)

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

@@ -16 +16 @@
                 $siteurl = get_option( 'siteurl' );
                 $sfn     = $_SERVER['SCRIPT_FILENAME'];
-                $this->assertSame( str_replace( '\\', '/', ABSPATH ), get_home_path() );
+                $this->assertSamePathIgnoringDirectorySeparators( ABSPATH, get_home_path() );
 
                 update_option( 'home', 'http://localhost' );

trunk/tests/phpunit/tests/block-template.php

@@ -396 +396 @@
          */
         public function test_get_block_templates_paths_dir_exists() {
-                $theme_dir = get_template_directory();
+                $theme_dir = $this->normalizeDirectorySeparatorsInPath( get_template_directory() );
                 // Templates in the current theme.
                 $templates = array(
@@ -416 +416 @@
 
                 $template_paths = _get_block_templates_paths( $theme_dir );
+                $template_paths = array_map( array( $this, 'normalizeDirectorySeparatorsInPath' ), _get_block_templates_paths( $theme_dir ) );
+
                 $this->assertSameSets( $expected_template_paths, $template_paths );
         }

trunk/tests/phpunit/tests/filesystem/wpFilesystemDirect/chdir.php

@@ -87 +87 @@
                 );
 
-                $this->assertSame(
+                $this->assertSamePathIgnoringDirectorySeparators(
                         $path,
                         $cwd_result,

trunk/tests/phpunit/tests/theme.php

@@ -926 +926 @@
         public function test_get_stylesheet_directory() {
                 switch_theme( 'block-theme-child' );
-                $this->assertSame( realpath( DIR_TESTDATA ) . '/themedir1/block-theme-child', get_stylesheet_directory() );
+                $this->assertSamePathIgnoringDirectorySeparators( realpath( DIR_TESTDATA ) . '/themedir1/block-theme-child', get_stylesheet_directory() );
         }
 
@@ -938 +938 @@
         public function test_get_template_directory() {
                 switch_theme( 'block-theme-child' );
-                $this->assertSame( realpath( DIR_TESTDATA ) . '/themedir1/block-theme', get_template_directory() );
+                $this->assertSamePathIgnoringDirectorySeparators( realpath( DIR_TESTDATA ) . '/themedir1/block-theme', get_template_directory() );
         }