Changeset 800 in tests for trunk/wp-testcase/test_uploads.php

Timestamp:

06/30/2012 08:21:35 PM (13 years ago)

Author:

nacin

Message:

Port test_uploads.php. fixes #70. fixes #27.

File:

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

trunk/wp-testcase/test_uploads.php

@@ -1 +1 @@
 <?php
 
-// test various functions used by the uploader
 
-class TestUploadFunctions extends WPTestCase {
+/**
+ * @group upload
+ * @group media
+ */
+class TestUploadFunctions extends WP_UnitTestCase {
 
-    var $siteurl = 'http://example.com/foo';
+    var $siteurl;
 
     function setUp() {
@@ -12 +15 @@
 
         parent::setUp();
-        update_option( 'siteurl', $this->siteurl );
+        return;
         // system defaults
         update_option( 'upload_path', 'wp-content/uploads' );
@@ -23 +26 @@
 
         // Remove year/month folders created by wp_upload_dir().
-        $this->_destroy_uploads();
+        $uploads = wp_upload_dir(); 
+        foreach ( scandir( $uploads['basedir'] ) as $file )
+            _rmdir( $uploads['basedir'] . '/' . $file ); 
         _rmdir( ABSPATH . 'foo/' );
-    }
-
-    // See #UT27
-    function _maybe_absolute_uploads_url( $url ) {
-        if ( '/wp-content' == WP_CONTENT_URL )
-            return $url;
-
-        return $this->siteurl . $url;
     }
 
@@ -38 +35 @@
         // wp_upload_dir() with default parameters
         $info = wp_upload_dir();
-        $this->assertEquals( $this->_maybe_absolute_uploads_url( '/wp-content/uploads/' ) . gmstrftime('%Y/%m'), $info['url'] );
+        $this->assertEquals( get_option( 'siteurl' ) . '/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'] );
@@ -48 +45 @@
         update_option( 'upload_path', 'foo/bar' );
         $info = wp_upload_dir();
-        $this->assertEquals( $this->siteurl . '/foo/bar/' . gmstrftime('%Y/%m'), $info['url'] );
+        $this->assertEquals( get_option( 'siteurl' ) . '/foo/bar/' . gmstrftime('%Y/%m'), $info['url'] );
         $this->assertEquals( ABSPATH . 'foo/bar/' . gmstrftime('%Y/%m'), $info['path'] );
         $this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
@@ -70 +67 @@
         update_option( 'uploads_use_yearmonth_folders', 0 );
         $info = wp_upload_dir();
-        $this->assertEquals( $this->_maybe_absolute_uploads_url( '/wp-content/uploads' ), $info['url'] );
+        $this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads', $info['url'] );
         $this->assertEquals( ABSPATH . 'wp-content/uploads', $info['path'] );
         $this->assertEquals( '', $info['subdir'] );
@@ -89 +86 @@
         update_option('upload_path', '');
         $info = wp_upload_dir();
-        $this->assertEquals( $this->_maybe_absolute_uploads_url( '/wp-content/uploads/' ) . gmstrftime('%Y/%m'), $info['url'] );
+        $this->assertEquals( get_option( 'siteurl' ) . '/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'] );