Changeset 11255

Timestamp:

11/28/2016 01:45:21 PM (10 years ago)

Author:

djpaul

Message:

Tests: fix test_bp_core_ajax_url() not passing after r11254.

Fixes #7367

File:

• trunk/tests/phpunit/testcases/routing/url.php (modified) (3 diffs)

trunk/tests/phpunit/testcases/routing/url.php

@@ -6 +6 @@
         function test_bp_core_ajax_url() {
                 $forced = force_ssl_admin();
+                $old_https = isset( $_SERVER['HTTPS'] ) ? $_SERVER['HTTPS'] : null;
 
                 // (1) HTTPS off
@@ -27 +28 @@
 
                 // (2b) Dashboard
+                $_SERVER['HTTPS'] = 'on';
                 $this->go_to( '/wp-admin' );
                 $this->assertEquals( bp_core_ajax_url(), get_site_url( bp_get_root_blog_id(), '/wp-admin/admin-ajax.php', 'https' ) );
 
+                // Restore to defaults.
                 force_ssl_admin( $forced );
+                if ( is_null( $old_https ) ) {
+                        unset( $_SERVER['HTTPS'] );
+                } else {
+                        $_SERVER['HTTPS'] = $old_https;
+                }
 
                 // (3) Multisite, root blog other than 1
@@ -38 +46 @@
                                 'path' => '/path' . rand() . time() . '/',
                         ) );
+
                         buddypress()->root_blog_id = $blog_id;
-
                         $blog_url = get_blog_option( $blog_id, 'siteurl' );
 
                         $this->go_to( trailingslashit( $blog_url ) );
+                        switch_to_blog( $blog_id );
+
                         buddypress()->root_blog_id = $original_root_blog;
                         $ajax_url = bp_core_ajax_url();
+
+                        restore_current_blog();
                         $this->go_to( '/' );