Changeset 584 in tests for wp-testcase/test_uploads.php

Timestamp:

03/20/2012 07:46:53 PM (14 years ago)

Author:

nacin

Message:

Fix failing tests in TestUploadFunctions. see #27.

File:

• wp-testcase/test_uploads.php (modified) (5 diffs)

wp-testcase/test_uploads.php

@@ -13 +13 @@
         update_option( 'upload_url_path', '' );
         update_option( 'uploads_use_yearmonth_folders', 1 );
+    }
 
+    // See #UT27
+    function _maybe_absolute_uploads_url( $url ) {
+        if ( '/wp-content' == WP_CONTENT_URL )
+            return $url;
+
+        return $this->siteurl . $url;
     }
 
@@ -19 +26 @@
         // wp_upload_dir() with default parameters
         $info = wp_upload_dir();
-        $this->assertEquals( $this->siteurl . '/wp-content/uploads/' . gmstrftime('%Y/%m'), $info['url'] );
+        $this->assertEquals( $this->_maybe_absolute_uploads_url( '/wp-content/uploads/' ) . gmstrftime('%Y/%m'), $info['url'] );
         $this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime('%Y/%m'), $info['path'] );
         $this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
@@ -26 +33 @@
 
     function test_upload_dir_relative() {
-        // wp_upload_dir() with a relative upload path
+        // wp_upload_dir() with a relative upload path that is not 'wp-content/uploads'
         update_option( 'upload_path', 'foo/bar' );
         $info = wp_upload_dir();
@@ -51 +58 @@
         update_option( 'uploads_use_yearmonth_folders', 0 );
         $info = wp_upload_dir();
-        $this->assertEquals( $this->siteurl . '/wp-content/uploads', $info['url'] );
+        $this->assertEquals( $this->_maybe_absolute_uploads_url( '/wp-content/uploads' ), $info['url'] );
         $this->assertEquals( ABSPATH . 'wp-content/uploads', $info['path'] );
         $this->assertEquals( '', $info['subdir'] );
@@ -70 +77 @@
         update_option('upload_path', '');
         $info = wp_upload_dir();
-        $this->assertEquals( $this->siteurl . '/wp-content/uploads/' . gmstrftime('%Y/%m'), $info['url'] );
+        $this->assertEquals( $this->_maybe_absolute_uploads_url( '/wp-content/uploads/' ) . gmstrftime('%Y/%m'), $info['url'] );
         $this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime('%Y/%m'), $info['path'] );
         $this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );