vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-16 06:40:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Widgets: Revert [51705].

Browse Source 
While the new name is much better, it doesn't fully tell what will happen when invoked nor does it fully solve the root problems. 

Why? The function is doing too much. And naming is hard.

Props azaozz, desrosj, andraganescu, zieladam, hellofromTonya.
See #53811.

git-svn-id: https://develop.svn.wordpress.org/trunk@51791 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Tonya Mork
2021-09-09 21:39:39 +00:00
parent 50d7248e1e
commit 1d0e4441c1
8 changed files with 36 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/tests/widgets.php
+18 -18
View File
@@ -843,9 +843,9 @@ class Tests_Widgets extends WP_UnitTestCase {
/**
* Tests for when 'sidebars_widgets' theme mod is populated.
*
* @covers ::sync_registered_widgets
* @covers ::retrieve_widgets
*/
function test_sync_registered_widgets_with_theme_mod() {
function test_retrieve_widgets_with_theme_mod() {
global $sidebars_widgets, $_wp_sidebars_widgets;
wp_widgets_init();
@@ -873,7 +873,7 @@ class Tests_Widgets extends WP_UnitTestCase {
'wp_inactive_widgets' => array(),
);
$result = sync_registered_widgets( true );
$result = retrieve_widgets( true );
$this->assertIsArray( $result );
$this->assertSame( $result, $sidebars_widgets );
@@ -906,9 +906,9 @@ class Tests_Widgets extends WP_UnitTestCase {
/**
* Tests for when sidebars widgets matches registered sidebars.
*
* @covers ::sync_registered_widgets
* @covers ::retrieve_widgets
*/
function test_sync_registered_widgets_with_sidebars_widgets_matching_registered_sidebars() {
function test_retrieve_widgets_with_sidebars_widgets_matching_registered_sidebars() {
global $sidebars_widgets;
wp_widgets_init();
@@ -921,7 +921,7 @@ class Tests_Widgets extends WP_UnitTestCase {
'wp_inactive_widgets' => array(),
);
$result = sync_registered_widgets( true );
$result = retrieve_widgets( true );
// $sidebars_widgets matches registered sidebars.
$this->assertIsArray( $result );
@@ -944,9 +944,9 @@ class Tests_Widgets extends WP_UnitTestCase {
/**
* Tests for when sidebars widgets doesn't match registered sidebars.
*
* @covers ::sync_registered_widgets
* @covers ::retrieve_widgets
*/
function test_sync_registered_widgets_with_sidebars_widgets_not_matching_registered_sidebars() {
function test_retrieve_widgets_with_sidebars_widgets_not_matching_registered_sidebars() {
global $sidebars_widgets, $_wp_sidebars_widgets;
wp_widgets_init();
@@ -960,7 +960,7 @@ class Tests_Widgets extends WP_UnitTestCase {
);
// Theme changed.
$result = sync_registered_widgets( true );
$result = retrieve_widgets( true );
$_wp_sidebars_widgets = array();
$this->assertIsArray( $result );
@@ -1002,7 +1002,7 @@ class Tests_Widgets extends WP_UnitTestCase {
);
// Theme did not change.
$result = sync_registered_widgets();
$result = retrieve_widgets();
$_wp_sidebars_widgets = array();
$this->assertIsArray( $result );
@@ -1036,9 +1036,9 @@ class Tests_Widgets extends WP_UnitTestCase {
/**
* Tests for Customizer mode.
*
* @covers ::sync_registered_widgets
* @covers ::retrieve_widgets
*/
function test_sync_registered_widgets_for_customizer() {
function test_retrieve_widgets_for_customizer() {
global $sidebars_widgets, $_wp_sidebars_widgets;
wp_widgets_init();
@@ -1053,7 +1053,7 @@ class Tests_Widgets extends WP_UnitTestCase {
);
set_theme_mod( 'sidebars_widgets', $old_sidebars_widgets );
$result = sync_registered_widgets( 'customize' );
$result = retrieve_widgets( 'customize' );
$_wp_sidebars_widgets = array();
$this->assertIsArray( $result );
@@ -1082,7 +1082,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$this->assertNotEquals( $sidebars_widgets, wp_get_sidebars_widgets() );
}
function test_sync_registered_widgets_with_single_widget() {
function test_retrieve_widgets_with_single_widget() {
global $sidebars_widgets;
wp_widgets_init();
@@ -1099,7 +1099,7 @@ class Tests_Widgets extends WP_UnitTestCase {
);
// Theme changed.
$result = sync_registered_widgets( true );
$result = retrieve_widgets( true );
$this->assertContains( 'single', $result['wp_inactive_widgets'] );
}
@@ -1107,9 +1107,9 @@ class Tests_Widgets extends WP_UnitTestCase {
/**
* Tests for orphaned widgets being moved into inactive widgets.
*
* @covers ::sync_registered_widgets
* @covers ::retrieve_widgets
*/
function test_sync_registered_widgets_move_orphaned_widgets_to_inactive() {
function test_retrieve_widgets_move_orphaned_widgets_to_inactive() {
global $sidebars_widgets;
wp_widgets_init();
@@ -1122,7 +1122,7 @@ class Tests_Widgets extends WP_UnitTestCase {
'orphaned_widgets_1' => array( 'calendar-1' ),
);
sync_registered_widgets();
retrieve_widgets();
$this->assertIsArray( $sidebars_widgets );