Changeset 46282

Timestamp:

09/23/2019 10:03:53 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: Correct sidebar names for Twenty Twenty.

See #48110.

Location:

trunk/tests/phpunit/tests/customize

Files:

• manager.php (modified) (3 diffs)
• widgets.php (modified) (4 diffs)

trunk/tests/phpunit/tests/customize/manager.php

@@ -1778 +1778 @@
         $old_sidebars_widgets = get_option( 'sidebars_widgets' );
         $new_sidebars_widgets = $old_sidebars_widgets;
-        $this->assertGreaterThan( 2, count( $new_sidebars_widgets['sidebar-1'] ) );
-        $new_sidebar_1 = array_reverse( $new_sidebars_widgets['sidebar-1'] );
+        $this->assertGreaterThan( 2, count( $new_sidebars_widgets['footer-one'] ) );
+        $new_sidebar_1 = array_reverse( $new_sidebars_widgets['footer-one'] );
 
         $post_id = $this->factory()->post->create(
@@ -1788 +1788 @@
                 'post_content' => wp_json_encode(
                     array(
-                        'sidebars_widgets[sidebar-1]' => array(
+                        'sidebars_widgets[footer-one]' => array(
                             'value' => $new_sidebar_1,
                         ),
@@ -1805 +1805 @@
         // Ensure that the value has actually been written to the DB.
         $updated_sidebars_widgets = get_option( 'sidebars_widgets' );
-        $this->assertEquals( $new_sidebar_1, $updated_sidebars_widgets['sidebar-1'] );
+        $this->assertEquals( $new_sidebar_1, $updated_sidebars_widgets['footer-one'] );
     }
 

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

@@ -34 +34 @@
         $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['sidebar-1'] );
-        $this->assertContains( 'categories-2', $sidebars_widgets['sidebar-1'] );
+        $this->assertContains( 'search-2', $sidebars_widgets['footer-one'] );
+        $this->assertContains( 'categories-2', $sidebars_widgets['footer-two'] );
         $this->assertArrayHasKey( 2, get_option( 'widget_search' ) );
         $widget_categories = get_option( 'widget_categories' );
@@ -102 +102 @@
      */
     function test_customize_register_with_deleted_sidebars() {
-        $sidebar_id = 'sidebar-1';
+        $sidebar_id = 'footer-one';
         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[sidebar-1]' );
+        $args         = $this->manager->widgets->get_setting_args( 'sidebars_widgets[footer-one]' );
         foreach ( $default_args as $key => $default_value ) {
             $this->assertEquals( $default_value, $args[ $key ] );
         }
-        $this->assertEquals( 'SIDEBARS_WIDGETS[SIDEBAR-1]', $args['uppercase_id_set_by_filter'] );
+        $this->assertEquals( 'SIDEBARS_WIDGETS[FOOTER-ONE]', $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' => 'sidebar-1' ) );
+        $output = $this->manager->widgets->render_widget_partial( $partial, array( 'sidebar_id' => 'footer-one' ) );
 
         $this->assertEquals( 1, substr_count( $output, 'data-customize-partial-id' ) );