Changeset 46283 for trunk/tests/phpunit/tests/customize/widgets.php

Timestamp:

09/23/2019 11:16:59 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Twenty Twenty: Rename widget areas to sidebar-1 and sidebar-2.

This ensures that widgets are mapped correctly and is consistent with the previous default themes.

See ​https://github.com/WordPress/twentytwenty/issues/481.

Reverts [46282].

Props ocean90, garrett-eclipse, desrosj, SergeyBiryukov.
See #48110.

File:

• trunk/tests/phpunit/tests/customize/widgets.php (modified) (4 diffs)

trunk/tests/phpunit/tests/customize/widgets.php

@@ -33 +33 @@
                 unset( $GLOBALS['_wp_sidebars_widgets'] ); // clear out cache set by wp_get_sidebars_widgets()
                 $sidebars_widgets = wp_get_sidebars_widgets();
-                $this->assertEqualSets( array( 'wp_inactive_widgets', 'footer-one', 'footer-two' ), array_keys( wp_get_sidebars_widgets() ) );
-                $this->assertContains( 'search-2', $sidebars_widgets['footer-one'] );
-                $this->assertContains( 'categories-2', $sidebars_widgets['footer-two'] );
+                $this->assertEqualSets( array( 'wp_inactive_widgets', 'sidebar-1', 'sidebar-2' ), array_keys( wp_get_sidebars_widgets() ) );
+                $this->assertContains( 'search-2', $sidebars_widgets['sidebar-1'] );
+                $this->assertContains( 'categories-2', $sidebars_widgets['sidebar-2'] );
                 $this->assertArrayHasKey( 2, get_option( 'widget_search' ) );
                 $widget_categories = get_option( 'widget_categories' );
@@ -102 +102 @@
          */
         function test_customize_register_with_deleted_sidebars() {
-                $sidebar_id = 'footer-one';
+                $sidebar_id = 'sidebar-1';
                 delete_option( 'sidebars_widgets' );
                 register_sidebar( array( 'id' => $sidebar_id ) );
@@ -312 +312 @@
                         'sanitize_js_callback' => array( $this->manager->widgets, 'sanitize_sidebar_widgets_js_instance' ),
                 );
-                $args         = $this->manager->widgets->get_setting_args( 'sidebars_widgets[footer-one]' );
+                $args         = $this->manager->widgets->get_setting_args( 'sidebars_widgets[sidebar-1]' );
                 foreach ( $default_args as $key => $default_value ) {
                         $this->assertEquals( $default_value, $args[ $key ] );
                 }
-                $this->assertEquals( 'SIDEBARS_WIDGETS[FOOTER-ONE]', $args['uppercase_id_set_by_filter'] );
+                $this->assertEquals( 'SIDEBARS_WIDGETS[SIDEBAR-1]', $args['uppercase_id_set_by_filter'] );
 
                 $override_args = array(
@@ -654 +654 @@
                 $this->assertFalse( $this->manager->widgets->render_widget_partial( $partial, array( 'sidebar_id' => 'non-existing' ) ) );
 
-                $output = $this->manager->widgets->render_widget_partial( $partial, array( 'sidebar_id' => 'footer-one' ) );
+                $output = $this->manager->widgets->render_widget_partial( $partial, array( 'sidebar_id' => 'sidebar-1' ) );
 
                 $this->assertEquals( 1, substr_count( $output, 'data-customize-partial-id' ) );