Changeset 34899

Timestamp:

10/07/2015 06:14:14 AM (11 years ago)

Author:

jeremyfelt

Message:

Tests: Improve tests for is_upload_space_available().

• Move all tests to a new 'multisite/isUploadSpaceAvailable.php'
• Store original blog_upload_space values before the class is loaded.
• Restore these values after each test tear down to avoid pollution.

Commit to testing is_upload_space_available() itself by always filtering the amount of space used through pre_get_space_used. This allows us to sanely test without worrying about the local environment. In the future, we may be able to remove some of these tests as get_upload_space_available() tests are built out and reliable.

See #34037.

Location:

trunk/tests/phpunit/tests/multisite

Files:

• isUploadSpaceAvailable.php (added)
• site.php (modified) (1 diff)

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

@@ -1017 +1017 @@
         }
 
-        function test_is_upload_space_available_default() {
-                $this->assertTrue( is_upload_space_available() );
-        }
-
-        function test_is_upload_space_available_check_disabled() {
-                update_site_option( 'upload_space_check_disabled', true );
-                $this->assertTrue( is_upload_space_available() );
-        }
-
-        function test_is_upload_space_available_space_used_is_less() {
-                update_site_option( 'upload_space_check_disabled', false );
-                update_site_option( 'blog_upload_space', 350 );
-                add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-                $available = is_upload_space_available();
-                remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
-                $this->assertTrue( is_upload_space_available() );
-                $this->assertEquals(
-                        $available,
-                        self::$space_used < 350
-                );
-        }
-
-        function test_is_upload_space_available_space_used_is_more() {
-                update_site_option( 'upload_space_check_disabled', false );
-                update_site_option( 'blog_upload_space', 250 );
-                add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-                $available = is_upload_space_available();
-                $used = get_space_used();
-                remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
-                $this->assertEquals(
-                        $available,
-                        $used < 250
-                );
-        }
-
-        function test_is_upload_space_available_upload_space_0() {
-                update_site_option( 'upload_space_check_disabled', false );
-                update_site_option( 'blog_upload_space', 0 );
-                $this->assertTrue( is_upload_space_available() );
-        }
-
-        function test_is_upload_space_available_upload_space_negative() {
-                update_site_option( 'upload_space_check_disabled', false );
-                update_site_option( 'blog_upload_space', -1 );
-                $this->assertFalse( is_upload_space_available() );
-        }
-
         /**
          * Test the primary purpose of get_blog_post(), to retrieve a post from