Changeset 10370

Timestamp:

11/19/2015 07:49:04 PM (11 years ago)

Author:

r-a-y

Message:

Tests: Fix avatar test due to changes in #6737.

See #6737.

File:

• trunk/tests/phpunit/testcases/core/avatars.php (modified) (1 diff)

trunk/tests/phpunit/testcases/core/avatars.php

@@ -136 +136 @@
                         }
 
-                        $avatar_url = $host . md5( strtolower( $this->params['email'] ) ) . '?d=' . $default_grav . '&s=' . $this->params['width'];
+                        $avatar_url = $host . md5( strtolower( $this->params['email'] ) );
+
+                        // Main Gravatar URL args.
+                        $url_args = array(
+                                's' => $this->params['width']
+                        );
+
+                        // Force default.
+                        if ( ! empty( $this->params['force_default'] ) ) {
+                                $url_args['f'] = 'y';
+                        }
 
                         // Gravatar rating; http://bit.ly/89QxZA
                         $rating = strtolower( get_option( 'avatar_rating' ) );
                         if ( ! empty( $rating ) ) {
-                                $avatar_url .= "&r={$rating}";
+                                $url_args['r'] = $rating;
                         }
+
+                        // Default avatar.
+                        if ( 'gravatar_default' !== $default_grav ) {
+                                $url_args['d'] = $default_grav;
+                        }
+
+                        // Set up the Gravatar URL.
+                        $avatar_url = esc_url( add_query_arg(
+                                rawurlencode_deep( array_filter( $url_args ) ),
+                                $avatar_url
+                        ) );
+
                 }