Changeset 38850

Timestamp:

10/21/2016 05:27:56 AM (10 years ago)

Author:

pento

Message:

Tests: Prevent Twenty Seventeen from interfering with Customizer tests.

This was previously fixed in [38837], but it wasn't really the correct answer, to fix it in the theme. So, [38837] is reverted in this commit, and the Twenty Seventeen actions causing problems are unhooked before tests are run.

See #38372.

Location:

trunk

Files:

• src/wp-content/themes/twentyseventeen/inc/customizer.php (modified) (1 diff)
• tests/phpunit/tests/customize/control.php (modified) (1 diff)
• tests/phpunit/tests/customize/custom-css-setting.php (modified) (1 diff)
• tests/phpunit/tests/customize/manager.php (modified) (1 diff)
• tests/phpunit/tests/customize/nav-menu-item-setting.php (modified) (1 diff)
• tests/phpunit/tests/customize/nav-menu-setting.php (modified) (1 diff)
• tests/phpunit/tests/customize/nav-menus.php (modified) (1 diff)
• tests/phpunit/tests/customize/partial.php (modified) (1 diff)
• tests/phpunit/tests/customize/selective-refresh.php (modified) (1 diff)
• tests/phpunit/tests/customize/widgets.php (modified) (1 diff)

trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php

@@ -14 +14 @@
  */
 function twentyseventeen_customize_register( $wp_customize ) {
-        $postMessage_settings = array( 'blogname', 'blogdescription', 'header_textcolor' );
-        foreach( $postMessage_settings as $postMessage_setting ) {
-                $setting = $wp_customize->get_setting( $postMessage_setting );
-                if ( $setting ) {
-                        $setting->transport = 'postMessage';
-                }
-        }
+        $wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
+        $wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
+        $wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 
         /**

trunk/tests/phpunit/tests/customize/control.php

@@ -32 +32 @@
                 // @codingStandardsIgnoreEnd
                 $this->wp_customize = $GLOBALS['wp_customize'];
+
+                // Remove default theme actions that interfere with tests
+                remove_action( 'customize_register', 'twentyseventeen_customize_register' );
         }
 

trunk/tests/phpunit/tests/customize/custom-css-setting.php

@@ -37 +37 @@
                 $wp_customize = $this->wp_customize;
 
+                // Remove default theme actions that interfere with tests
+                remove_action( 'customize_register', 'twentyseventeen_customize_register' );
+
                 do_action( 'customize_register', $this->wp_customize );
                 $this->setting = new WP_Customize_Custom_CSS_Setting( $this->wp_customize, 'custom_css[twentysixteen]' );

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

@@ -59 +59 @@
                 $this->manager = $this->instantiate();
                 $this->undefined = new stdClass();
+
+                // Remove default theme actions that interfere with tests
+                remove_action( 'customize_register', 'twentyseventeen_customize_register' );
         }
 

trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php

@@ -27 +27 @@
                 $this->wp_customize = new WP_Customize_Manager();
                 $wp_customize = $this->wp_customize;
+
+                // Remove default theme actions that interfere with tests
+                remove_action( 'customize_register', 'twentyseventeen_customize_register' );
         }
 

trunk/tests/phpunit/tests/customize/nav-menu-setting.php

@@ -28 +28 @@
                 $this->wp_customize = new WP_Customize_Manager();
                 $wp_customize = $this->wp_customize;
+
+                // Remove default theme actions that interfere with tests
+                remove_action( 'customize_register', 'twentyseventeen_customize_register' );
         }
 

trunk/tests/phpunit/tests/customize/nav-menus.php

@@ -27 +27 @@
                 $this->wp_customize = new WP_Customize_Manager();
                 $wp_customize = $this->wp_customize;
+
+                // Remove default theme actions that interfere with tests
+                remove_action( 'customize_register', 'twentyseventeen_customize_register' );
         }
 

trunk/tests/phpunit/tests/customize/partial.php

@@ -40 +40 @@
                         $this->selective_refresh = $this->wp_customize->selective_refresh;
                 }
+
+                // Remove default theme actions that interfere with tests
+                remove_action( 'customize_register', 'twentyseventeen_customize_register' );
         }
 

trunk/tests/phpunit/tests/customize/selective-refresh.php

@@ -40 +40 @@
                         $this->selective_refresh = $this->wp_customize->selective_refresh;
                 }
+
+                // Remove default theme actions that interfere with tests
+                remove_action( 'customize_register', 'twentyseventeen_customize_register' );
         }
 

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

@@ -46 +46 @@
                 remove_action( 'customize_register', 'twentysixteen_customize_register', 11 );
                 remove_action( 'after_setup_theme', 'twentyseventeen_setup' );
+                remove_action( 'customize_register', 'twentyseventeen_customize_register' );
 
                 $this->backup_registered_sidebars = $GLOBALS['wp_registered_sidebars'];