Changeset 38513 for trunk/tests/phpunit/tests/customize/manager.php

Timestamp:

09/02/2016 10:34:48 PM (8 years ago)

Author:

westonruter

Message:

Customize: Fix php warning due to WP_Customize_Manager::prepare_setting_validity_for_js() incorrectly assuming that WP_Error will only ever have arrays in its $error_data.

• Eliminates the server mutating the a WP_Error's $error_data to merge-in a $from_server flag (since it may not be an array to begin with). Instead it defers to the client to add a fromServer param on any Notification instances created from server-sent errors.
• Ensures that notifications will be re-rendered if a notification's message changes but the data and type remain the same.
• Adds explicit support for the Notification class to have a setting property, ensuring that the property is set whereas previously it was dropped.

Fixes #37890.
Props westonruter, dlh.

File:

• trunk/tests/phpunit/tests/customize/manager.php (modified) (2 diffs)

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

@@ -304 +304 @@
         $this->assertTrue( $this->manager->prepare_setting_validity_for_js( true ) );
         $error = new WP_Error();
-        $error->add( 'bad_letter', 'Bad letter' );
-        $error->add( 'bad_letter', 'Bad letra' );
+        $error->add( 'bad_letter', 'Bad letter', 'A' );
+        $error->add( 'bad_letter', 'Bad letra', 123 );
         $error->add( 'bad_number', 'Bad number', array( 'number' => 123 ) );
         $validity = $this->manager->prepare_setting_validity_for_js( $error );
@@ -314 +314 @@
             $this->assertEquals( join( ' ', $messages ), $validity[ $code ]['message'] );
             $this->assertArrayHasKey( 'data', $validity[ $code ] );
-            $this->assertArrayHasKey( 'from_server', $validity[ $code ]['data'] );
+            $this->assertEquals( $validity[ $code ]['data'], $error->get_error_data( $code ) );
         }
         $this->assertArrayHasKey( 'number', $validity['bad_number']['data'] );