Changeset 39350 for trunk/tests/phpunit/tests/customize/custom-css-setting.php

Timestamp:

11/23/2016 05:33:21 PM (7 years ago)

Author:

westonruter

Message:

Customize: Refactor logic for updating custom_css posts by introducing wp_update_custom_css_post() function and renaming update filter.

• Moves logic from WP_Customize_Custom_CSS_Setting::update() into a re-usable wp_update_custom_css_post() function, useful for future REST API endpoint, WP-CLI command, or plugin migrations.
• Renames customize_update_custom_css_post_content_args filter to update_custom_css_data and improves the naming of the parameters. Instead of passing post_content and post_content_filtered the filtered array now contains css and preprocessed respectively.
• The second context param for the update_custom_css_data filter is now an array of the original args passed to wp_update_custom_css_post() and there is now no more $setting arg since it isn't necessarily being called in the customizer context.

Props westonruter, georgestephanis.
See #35395.
Fixes #38672.

File:

• trunk/tests/phpunit/tests/customize/custom-css-setting.php (modified) (4 diffs)

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

@@ -152 +152 @@
         $this->assertEquals( $updated_css, $this->setting->value() );
         $this->assertEquals( $updated_css, wp_get_custom_css( $this->setting->stylesheet ) );
+        $this->assertEquals( $updated_css, get_post( $post_id )->post_content );
 
         $previewed_css = 'body { color: red; }';
@@ -159 +160 @@
         $this->assertEquals( $previewed_css, wp_get_custom_css( $this->setting->stylesheet ) );
 
+        // Make sure that wp_update_custom_css_post() works as expected for updates.
+        $r = wp_update_custom_css_post( 'body { color:red; }', array(
+            'stylesheet' => $this->setting->stylesheet,
+            'preprocessed' => "body\n\tcolor:red;",
+        ) );
+        $this->assertInstanceOf( 'WP_Post', $r );
+        $this->assertEquals( $post_id, $r->ID );
+        $this->assertEquals( 'body { color:red; }', get_post( $r )->post_content );
+        $this->assertEquals( "body\n\tcolor:red;", get_post( $r )->post_content_filtered );
+        $r = wp_update_custom_css_post( 'body { content: "\o/"; }' );
+        $this->assertEquals( $this->wp_customize->get_stylesheet(), get_post( $r )->post_name );
+        $this->assertEquals( 'body { content: "\o/"; }', get_post( $r )->post_content );
+        $this->assertEquals( '', get_post( $r )->post_content_filtered );
+
+        // Make sure that wp_update_custom_css_post() works as expected for insertion.
+        $r = wp_update_custom_css_post( 'body { background:black; }', array(
+            'stylesheet' => 'other',
+        ) );
+        $this->assertInstanceOf( 'WP_Post', $r );
+        $this->assertEquals( 'other', get_post( $r )->post_name );
+        $this->assertEquals( 'body { background:black; }', get_post( $r )->post_content );
+        $this->assertEquals( 'publish', get_post( $r )->post_status );
+
+        // Test deletion.
         wp_delete_post( $post_id );
         $this->assertNull( wp_get_custom_css_post() );
@@ -226 +251 @@
         $original_title = $post->post_title;
 
-        add_filter( 'customize_update_custom_css_post_content_args', array( $this, 'filter_update_post_content_args' ), 10, 3 );
+        add_filter( 'update_custom_css_data', array( $this, 'filter_update_custom_css_data' ), 10, 3 );
         $this->setting->save();
 
@@ -239 +264 @@
      * Filter `customize_update_custom_css_post_content_args`.
      *
-     * @param array                $args    Post array.
-     * @param string               $css     CSS.
-     * @param WP_Customize_Setting $setting Setting.
-     * @return array Args.
-     */
-    function filter_update_post_content_args( $args, $css, $setting ) {
+     * @param array  $data Data.
+     * @param string $args Args.
+     * @return array Data.
+     */
+    function filter_update_custom_css_data( $data, $args ) {
+        $this->assertInternalType( 'array', $data );
+        $this->assertEqualSets( array( 'css', 'preprocessed' ), array_keys( $data ) );
+        $this->assertEquals( '', $data['preprocessed'] );
         $this->assertInternalType( 'array', $args );
-        $this->assertEqualSets( array( 'post_content', 'post_content_filtered' ), array_keys( $args ) );
-        $this->assertEquals( $css, $args['post_content'] );
-        $this->assertEquals( '', $args['post_content_filtered'] );
-        $this->assertInstanceOf( 'WP_Customize_Custom_CSS_Setting', $setting );
-
-        $args['post_content'] .= '/* filtered post_content */';
-        $args['post_content_filtered'] = '/* filtered post_content_filtered */';
-        $args['post_title'] = 'Ignored';
-        return $args;
+        $this->assertEqualSets( array( 'css', 'preprocessed', 'stylesheet' ), array_keys( $args ) );
+        $this->assertEquals( $args['css'], $data['css'] );
+        $this->assertEquals( $args['preprocessed'], $data['preprocessed'] );
+
+        $data['css'] .= '/* filtered post_content */';
+        $data['preprocessed'] = '/* filtered post_content_filtered */';
+        $data['post_title'] = 'Ignored';
+        return $data;
     }