Changeset 10092

Timestamp:

09/06/2015 02:06:55 PM (9 years ago)

Author:

imath

Message:

Unit tests: make sure to test bp_upload_dir() in non ms configs too

Fixes #6473

File:

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

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

@@ -604 +604 @@
      * @group bp_upload_dir
      */
-    public function test_bp_upload_dir_ms() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
+    public function test_bp_upload_dir() {
+        $expected_upload_dir = wp_upload_dir();
+
+        if ( is_multisite() ) {
+            $b = $this->factory->blog->create();
+            switch_to_blog( $b );
         }
 
-        $expected_upload_dir = wp_upload_dir();
-
-        $b = $this->factory->blog->create();
-
-        switch_to_blog( $b );
-
         $tested_upload_dir = bp_upload_dir();
 
-        restore_current_blog();
+        if ( is_multisite() ) {
+            restore_current_blog();
+        }
 
         $this->assertSame( $expected_upload_dir, $tested_upload_dir );