Changeset 30286

Timestamp:

11/08/2014 09:07:05 PM (10 years ago)

Author:

jeremyfelt

Message:

Move tests for ms_files_rewriting to separate group, ms-files

When the ms_files_rewriting flag is enabled, ms_upload_constants() is required to properly set upload directory constants. Once this fires, it is impossible to clean up for a non ms_files_rewriting test by turning the option back off.

Excluding these tests by default offer a more consistent environment overall. Any tests written for uploaded files in multisite should ideally have a correspondign test in this area.

This commit also moves existing ms_files_rewriting tests for test_switch_upload_dir().

Fixes #30256

Location:

trunk/tests/phpunit

Files:

• includes/bootstrap.php (modified) (3 diffs)
• multisite.xml (modified) (1 diff)
• tests/multisite/ms-files-rewriting.php (added)
• tests/multisite/site.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -130 +130 @@
 
         $ajax_message = true;
+        $ms_files_message = true;
         foreach ( $options as $option ) {
             switch ( $option[0] ) {
                 case '--exclude-group' :
                     $ajax_message = false;
+                    $ms_files_message = false;
                     continue 2;
                 case '--group' :
@@ -143 +145 @@
                     }
                     $ajax_message = ! in_array( 'ajax', $groups );
+                    $ms_files_message = ! in_array( 'ms-files', $groups );
                     continue 2;
             }
@@ -149 +152 @@
             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;
+        }
     }
 }

trunk/tests/phpunit/multisite.xml

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

trunk/tests/phpunit/tests/multisite/site.php

@@ -950 +950 @@
         $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 );
     }