Ticket #30256: 30256.2.diff

tests/phpunit/includes/bootstrap.php

@@ -132 +132 @@
                         switch ( $option[0] ) {
                                 case '--exclude-group' :
                                         $ajax_message = false;
+                                        $ms_files_message = false;
                                         continue 2;
                                 case '--group' :
                                         $groups = explode( ',', $option[1] );
@@ -141 +142 @@
                                                 }
                                         }
                                         $ajax_message = ! in_array( 'ajax', $groups );
+                                        $ms_files_message = ! in_array( 'ms-files', $groups );
                                         continue 2;
                         }
                 }
                 if ( $ajax_message ) {
                         echo "Not running ajax tests... To execute these, use --group ajax." . PHP_EOL;
                 }
+                if ( $ms_files_message ) {
+                        echo "Not running ms_files_rewriting tests... To execute these, use --group ms-files." . PHP_EOL;
+                }
     }
 }
 new WP_PHPUnit_Util_Getopt( $_SERVER['argv'] );

tests/phpunit/multisite.xml

@@ -23 +23 @@
     <groups>
         <exclude>
             <group>ajax</group>
+            <group>ms-files</group>
         </exclude>
     </groups>
     <php>

tests/phpunit/tests/multisite/ms-files-rewriting.php

@@ +1 @@
+<?php
+
+if ( is_multisite() ) :
+
+/**
+ * Tests specific to the ms_files_rewriting option in multisite.
+ *
+ * The ms-files group tag must be used for these tests to run as the constants
+ * set in ms_upload_constants() conflict with a non ms-files configuration.
+ *
+ * @group ms-files
+ * @group multisite
+ */
+class Tests_Multisite_MS_Files_Rewriting extends WP_UnitTestCase {
+        protected $suppress = false;
+
+        function setUp() {
+                global $wpdb;
+                parent::setUp();
+                $this->suppress = $wpdb->suppress_errors();
+
+                $_SERVER[ 'REMOTE_ADDR' ] = '';
+
+                update_site_option( 'ms_files_rewriting', 1 );
+                ms_upload_constants();
+        }
+
+        function tearDown() {
+                global $wpdb;
+                update_site_option( 'ms_files_rewriting', 0 );
+                parent::tearDown();
+                $wpdb->suppress_errors( $this->suppress );
+        }
+
+        function test_switch_upload_dir() {
+                $this->assertTrue( is_main_site() );
+
+                $site = get_current_site();
+
+                $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
+                $blog_id2 = $this->factory->blog->create( array( 'user_id' => $user_id ) );
+                $info = wp_upload_dir();
+                $this->assertEquals( 'http://' . $site->domain . '/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'] );
+                $this->assertEquals( '', $info['error'] );
+
+                switch_to_blog( $blog_id2 );
+                $info2 = wp_upload_dir();
+                $this->assertNotEquals( $info, $info2 );
+                $this->assertEquals( get_option( 'siteurl' )  . '/wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . gmstrftime('%Y/%m'), $info2['url'] );
+                $this->assertEquals( ABSPATH . 'wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . gmstrftime('%Y/%m'), $info2['path'] );
+                $this->assertEquals( gmstrftime('/%Y/%m'), $info2['subdir'] );
+                $this->assertEquals( '', $info2['error'] );
+                restore_current_blog();
+        }
+}
+
+endif;
+ No newline at end of file

tests/phpunit/tests/multisite/site.php

@@ -949 +949 @@
                 $this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime('%Y/%m'), $info['path'] );
                 $this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
                 $this->assertEquals( '', $info['error'] );
-
-                update_site_option( 'ms_files_rewriting', 1 );
-                ms_upload_constants();
-
-                $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
-                $blog_id2 = $this->factory->blog->create( array( 'user_id' => $user_id ) );
-                $info = wp_upload_dir();
-                $this->assertEquals( 'http://' . $site->domain . '/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'] );
-                $this->assertEquals( '', $info['error'] );
-
-                switch_to_blog( $blog_id2 );
-                $info2 = wp_upload_dir();
-                $this->assertNotEquals( $info, $info2 );
-                $this->assertEquals( get_option( 'siteurl' )  . '/wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . gmstrftime('%Y/%m'), $info2['url'] );
-                $this->assertEquals( ABSPATH . 'wp-content/blogs.dir/' . get_current_blog_id() . '/files/' . gmstrftime('%Y/%m'), $info2['path'] );
-                $this->assertEquals( gmstrftime('/%Y/%m'), $info2['subdir'] );
-                $this->assertEquals( '', $info2['error'] );
-                restore_current_blog();
-                update_site_option( 'ms_files_rewriting', 0 );
         }
 
         /**

tests/phpunit/tests/post/attachments.php

@@ -88 +88 @@
 
                 $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
                 $contents = file_get_contents($filename);
-
-                $upload = wp_upload_bits(basename($filename), null, $contents);
+                $prefix = rand_str( 5 );
+                $upload = wp_upload_bits( $prefix . basename($filename), null, $contents);
                 $this->assertTrue( empty($upload['error']) );
 
                 $id = $this->_make_attachment($upload);
 
                 // intermediate copies should exist: thumbnail only
                 $thumb = image_get_intermediate_size($id, 'thumbnail');
-                $this->assertEquals( 'a2-small-150x150.jpg', $thumb['file'] );
+                $this->assertEquals( $prefix . 'a2-small-150x150.jpg', $thumb['file'] );
 
                 $uploads = wp_upload_dir();
                 $this->assertTrue( is_file($uploads['basedir'] . DIRECTORY_SEPARATOR . $thumb['path']) );
@@ -108 +108 @@
 
                 // image_downsize() should return the correct images and sizes
                 $downsize = image_downsize($id, 'thumbnail');
-                $this->assertEquals( 'a2-small-150x150.jpg', basename($downsize[0]) );
+                $this->assertEquals( $prefix . 'a2-small-150x150.jpg', basename($downsize[0]) );
                 $this->assertEquals( 150, $downsize[1] );
                 $this->assertEquals( 150, $downsize[2] );
 
                 // medium and full will both point to the original
                 $downsize = image_downsize($id, 'medium');
-                $this->assertEquals( 'a2-small.jpg', basename($downsize[0]) );
+                $this->assertEquals( $prefix . 'a2-small.jpg', basename($downsize[0]) );
                 $this->assertEquals( 400, $downsize[1] );
                 $this->assertEquals( 300, $downsize[2] );
 
                 $downsize = image_downsize($id, 'full');
-                $this->assertEquals( 'a2-small.jpg', basename($downsize[0]) );
+                $this->assertEquals( $prefix . 'a2-small.jpg', basename($downsize[0]) );
                 $this->assertEquals( 400, $downsize[1] );
                 $this->assertEquals( 300, $downsize[2] );