Changeset 7191

Timestamp:

06/07/2013 11:33:57 AM (12 years ago)

Author:

boonebgorges

Message:

In test_avatars_on_non_root_blog(), use go_to_root() to establish root blog

This ensures that all globals have been reset by the time avatar directories
are queried, preventing test failures when run in certain configs

File:

• trunk/tests/testcases/core/avatars.php (modified) (2 diffs)

trunk/tests/testcases/core/avatars.php

@@ -31 +31 @@
         // switch to BP root blog if necessary
         if ( bp_get_root_blog_id() != get_current_blog_id() ) {
-            switch_to_blog( get_current_blog_id() );
+            $this->go_to_root();
         }
 
@@ -49 +49 @@
 
         // test to see if the upload dir is correct
-        $this->assertEquals( bp_core_avatar_url(), $upload_dir['baseurl'] );
+        $this->assertEquals( $upload_dir['baseurl'], bp_core_avatar_url() );
 
         // reset globals