From 0834d013651ac3d57ef7551c97e9f728af3c5956 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Wed, 7 Jul 2021 15:48:13 +0000
Subject: [PATCH] =?UTF-8?q?Themes:=20Remove=20mention=20of=20=E2=80=9CFSE?=
 =?UTF-8?q?=E2=80=9D=20in=20Core.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

“FSE” themes are block themes.

Fixes #53497.

git-svn-id: https://develop.svn.wordpress.org/trunk@51370 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/{fse-pl_PL.mo => block-theme-pl_PL.mo} | Bin
 .../themes/{fse-pl_PL.po => block-theme-pl_PL.po} |   0
 .../phpunit/data/themedir1/block-theme/index.php  |   4 ++++
 .../data/themedir1/{fse => block-theme}/style.css |   4 ++--
 .../themedir1/{fse => block-theme}/theme.json     |   0
 tests/phpunit/data/themedir1/fse/index.php        |   4 ----
 tests/phpunit/tests/blocks/block-editor.php       |   2 +-
 tests/phpunit/tests/theme/wpThemeJsonResolver.php |  14 +++++++-------
 8 files changed, 14 insertions(+), 14 deletions(-)
 rename tests/phpunit/data/languages/themes/{fse-pl_PL.mo => block-theme-pl_PL.mo} (100%)
 rename tests/phpunit/data/languages/themes/{fse-pl_PL.po => block-theme-pl_PL.po} (100%)
 create mode 100644 tests/phpunit/data/themedir1/block-theme/index.php
 rename tests/phpunit/data/themedir1/{fse => block-theme}/style.css (65%)
 rename tests/phpunit/data/themedir1/{fse => block-theme}/theme.json (100%)
 delete mode 100644 tests/phpunit/data/themedir1/fse/index.php

diff --git a/tests/phpunit/data/languages/themes/fse-pl_PL.mo b/tests/phpunit/data/languages/themes/block-theme-pl_PL.mo
similarity index 100%
rename from tests/phpunit/data/languages/themes/fse-pl_PL.mo
rename to tests/phpunit/data/languages/themes/block-theme-pl_PL.mo
diff --git a/tests/phpunit/data/languages/themes/fse-pl_PL.po b/tests/phpunit/data/languages/themes/block-theme-pl_PL.po
similarity index 100%
rename from tests/phpunit/data/languages/themes/fse-pl_PL.po
rename to tests/phpunit/data/languages/themes/block-theme-pl_PL.po
diff --git a/tests/phpunit/data/themedir1/block-theme/index.php b/tests/phpunit/data/themedir1/block-theme/index.php
new file mode 100644
index 0000000000..589adcefcd
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme/index.php
@@ -0,0 +1,4 @@
+<?php
+/**
+ * Block theme.
+ */
diff --git a/tests/phpunit/data/themedir1/fse/style.css b/tests/phpunit/data/themedir1/block-theme/style.css
similarity index 65%
rename from tests/phpunit/data/themedir1/fse/style.css
rename to tests/phpunit/data/themedir1/block-theme/style.css
index efc4173053..72f24c1672 100644
--- a/tests/phpunit/data/themedir1/fse/style.css
+++ b/tests/phpunit/data/themedir1/block-theme/style.css
@@ -1,7 +1,7 @@
 /*
-Theme Name: FSE Theme
+Theme Name: Block Theme
 Theme URI: https://wordpress.org/
 Description: For testing purposes only.
 Version: 1.0.0
-Text Domain: fse
+Text Domain: block-theme
 */
diff --git a/tests/phpunit/data/themedir1/fse/theme.json b/tests/phpunit/data/themedir1/block-theme/theme.json
similarity index 100%
rename from tests/phpunit/data/themedir1/fse/theme.json
rename to tests/phpunit/data/themedir1/block-theme/theme.json
diff --git a/tests/phpunit/data/themedir1/fse/index.php b/tests/phpunit/data/themedir1/fse/index.php
deleted file mode 100644
index c674182076..0000000000
--- a/tests/phpunit/data/themedir1/fse/index.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-/**
- * Dummy theme.
- */
diff --git a/tests/phpunit/tests/blocks/block-editor.php b/tests/phpunit/tests/blocks/block-editor.php
index b1bda39abd..7baabe3ae2 100644
--- a/tests/phpunit/tests/blocks/block-editor.php
+++ b/tests/phpunit/tests/blocks/block-editor.php
@@ -347,7 +347,7 @@ class WP_Test_Block_Editor extends WP_UnitTestCase {
 	 * @ticket 53458
 	 */
 	function test_get_block_editor_settings_theme_json_settings() {
-		switch_theme( 'fse' );
+		switch_theme( 'block-theme' );
 
 		$post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
 
diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
index 4923a1b636..41dffe9faa 100644
--- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php
+++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
@@ -96,16 +96,16 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase {
 	 */
 	public function test_translations_are_applied() {
 		add_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
-		load_textdomain( 'fse', realpath( DIR_TESTDATA . '/languages/themes/fse-pl_PL.mo' ) );
+		load_textdomain( 'block-theme', realpath( DIR_TESTDATA . '/languages/themes/block-theme-pl_PL.mo' ) );
 
-		switch_theme( 'fse' );
+		switch_theme( 'block-theme' );
 
 		$actual = WP_Theme_JSON_Resolver::get_theme_data();
 
-		unload_textdomain( 'fse' );
+		unload_textdomain( 'block-theme' );
 		remove_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
 
-		$this->assertSame( wp_get_theme()->get( 'TextDomain' ), 'fse' );
+		$this->assertSame( wp_get_theme()->get( 'TextDomain' ), 'block-theme' );
 		$this->assertSame(
 			array(
 				'color'      => array(
@@ -183,11 +183,11 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase {
 		$default = WP_Theme_JSON_Resolver::theme_has_support();
 
 		// Switch to a theme that does have support.
-		switch_theme( 'fse' );
-		$fse = WP_Theme_JSON_Resolver::theme_has_support();
+		switch_theme( 'block-theme' );
+		$has_theme_json_support = WP_Theme_JSON_Resolver::theme_has_support();
 
 		$this->assertFalse( $default );
-		$this->assertTrue( $fse );
+		$this->assertTrue( $has_theme_json_support );
 	}
 
 }