<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[34901] trunk/tests/phpunit/tests/multisite: Tests: Improve tests for `upload_is_user_over_quota()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34901">34901</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34901","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-07 07:20:45 +0000 (Wed, 07 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests: Improve tests for `upload_is_user_over_quota()`.
* Move all tests to a new 'multisite/uploadIsUserOverQuota.php'
* Use `get_space_allowed` and `pre_get_space_used` filters to help avoid test pollution.
See <a href="https://core.trac.wordpress.org/ticket/34037">#34037</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmultisiteuploadIsUserOverQuotaphp">trunk/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2015-10-07 06:16:58 UTC (rev 34900)
+++ trunk/tests/phpunit/tests/multisite/site.php 2015-10-07 07:20:45 UTC (rev 34901)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -906,117 +906,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Provide a hardcoded amount for space used when testing upload quota,
- * allowed space, and available space.
- *
- * @return int
- */
- function _filter_space_used() {
- return 300;
- }
-
- function test_upload_is_user_over_quota_default() {
- $this->assertFalse( upload_is_user_over_quota( false ) );
- }
-
- function test_upload_is_user_over_quota_check_enabled() {
- update_site_option( 'upload_space_check_disabled', false );
- // will be set to ''
- $this->assertEmpty( get_site_option( 'upload_space_check_disabled' ) );
-
- $this->assertEquals(
- upload_is_user_over_quota( false ),
- self::$space_used > self::$space_allowed
- );
- }
-
- /**
- * When the upload space check is disabled, using more than the available
- * quota is allowed.
- */
- function test_upload_is_user_over_check_disabled() {
- update_site_option( 'upload_space_check_disabled', true );
- update_site_option( 'blog_upload_space', 100 );
- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
- $quota = upload_is_user_over_quota( false );
- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
- $this->assertFalse( $quota );
- }
-
- /**
- * If 0 is set for `blog_upload_space`, a fallback of 100 is used.
- */
- function test_upload_is_user_over_quota_upload_space_0() {
- update_site_option( 'upload_space_check_disabled', false );
- update_site_option( 'blog_upload_space', 0 );
-
- $this->assertEquals(
- upload_is_user_over_quota( false ),
- self::$space_used > self::$space_allowed
- );
- }
-
- /**
- * Filter the space space used as 300 to trigger a true upload quota
- * without requiring actual files.
- */
- function test_upload_is_user_over_quota_upload_space_0_filter_space_used() {
- update_site_option( 'upload_space_check_disabled', false );
- update_site_option( 'blog_upload_space', 0 );
- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
- $quota = upload_is_user_over_quota( false );
- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
- $this->assertTrue( $quota );
- }
-
- function test_upload_is_user_over_quota_upload_space_200() {
- update_site_option( 'upload_space_check_disabled', false );
- update_site_option( 'blog_upload_space', 200 );
- $this->assertEquals(
- upload_is_user_over_quota( false ),
- self::$space_used > 200
- );
- }
-
- function test_upload_is_user_over_quota_upload_space_200_filter_space_used() {
- update_site_option( 'upload_space_check_disabled', false );
- update_site_option( 'blog_upload_space', 200 );
- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
- $quota = upload_is_user_over_quota( false );
- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
- $this->assertTrue( $quota );
- }
-
- /**
- * If the space used is exactly the same as the available quota, an over
- * quota response is not expected.
- *
- * @group woo
- */
- function test_upload_is_user_over_quota_upload_space_exact() {
- update_site_option( 'upload_space_check_disabled', false );
- update_site_option( 'blog_upload_space', 300 );
- add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
- $quota = upload_is_user_over_quota( false );
- $used = get_space_used();
- remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
- $this->assertEquals(
- $quota,
- $used > 300
- );
- }
-
- function test_upload_is_user_over_quota_upload_space_negative() {
- update_site_option( 'upload_space_check_disabled', false );
- update_site_option( 'blog_upload_space', -1 );
- $this->assertTrue( upload_is_user_over_quota( false ) );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Test the primary purpose of get_blog_post(), to retrieve a post from
</span><span class="cx" style="display: block; padding: 0 10px"> * another site on the network.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisiteuploadIsUserOverQuotaphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php (rev 0)
+++ trunk/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php 2015-10-07 07:20:45 UTC (rev 34901)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,139 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+if ( is_multisite() ) :
+
+/**
+ * Tests specific to `upload_is_user_over_quota()` in multisite.
+ *
+ * These tests filter `get_space_allowed` and `pre_get_space_used` in
+ * most cases as those are tested elsewhere.
+ *
+ * @group multisite
+ */
+class Tests_Multisite_Upload_Is_User_Over_Quota extends WP_UnitTestCase {
+ protected $suppress = false;
+
+ public function setUp() {
+ global $wpdb;
+ parent::setUp();
+ $this->suppress = $wpdb->suppress_errors();
+
+ update_site_option( 'upload_space_check_disabled', false );
+ }
+
+ public function tearDown() {
+ global $wpdb;
+ $wpdb->suppress_errors( $this->suppress );
+ parent::tearDown();
+ }
+
+ /**
+ * In this scenario, 10 is set as the spaced allowed when 0 is returned
+ * by `get_space_allowed()` inside `upload_is_user_over_quota()`.
+ *
+ * This is likely not expected behavior.
+ */
+ public function test_upload_is_user_over_quota_allowed_0_used_5() {
+ add_filter( 'get_space_allowed', '__return_zero' );
+ add_filter( 'pre_get_space_used', array( $this, '_filter_space_5' ) );
+ $result = upload_is_user_over_quota( false );
+ remove_filter( 'get_space_allowed', '__return_zero' );
+ remove_filter( 'pre_get_space_used', array( $this, '_filter_space_5' ) );
+
+ $this->assertFalse( $result );
+ }
+
+ public function test_upload_is_user_over_quota_allowed_0_used_0() {
+ add_filter( 'get_space_allowed', '__return_zero' );
+ add_filter( 'pre_get_space_used', '__return_zero' );
+ $result = upload_is_user_over_quota( false );
+ remove_filter( 'get_space_allowed', '__return_zero' );
+ remove_filter( 'pre_get_space_used', '__return_zero' );
+
+ $this->assertFalse( $result );
+ }
+
+ public function test_upload_is_user_over_quota_allowed_0_used_100() {
+ add_filter( 'get_space_allowed', '__return_zero' );
+ add_filter( 'pre_get_space_used', array( $this, '_filter_space_100' ) );
+ $result = upload_is_user_over_quota( false );
+ remove_filter( 'get_space_allowed', '__return_zero' );
+ remove_filter( 'pre_get_space_used', array( $this, '_filter_space_100' ) );
+
+ $this->assertTrue( $result );
+ }
+
+ public function test_upload_is_user_over_quota_allowed_100_used_0() {
+ add_filter( 'get_space_allowed', array( $this, '_filter_space_100' ) );
+ add_filter( 'pre_get_space_used', '__return_zero' );
+ $result = upload_is_user_over_quota( false );
+ remove_filter( 'get_space_allowed', array( $this, '_filter_space_100' ) );
+ remove_filter( 'pre_get_space_used', '__return_zero' );
+
+ $this->assertFalse( $result );
+ }
+
+ public function test_upload_is_user_over_quota_allowed_100_used_100() {
+ add_filter( 'get_space_allowed', array( $this, '_filter_space_100' ) );
+ add_filter( 'pre_get_space_used', array( $this, '_filter_space_100' ) );
+ $result = upload_is_user_over_quota( false );
+ remove_filter( 'get_space_allowed', array( $this, '_filter_space_100' ) );
+ remove_filter( 'pre_get_space_used', array( $this, '_filter_space_100' ) );
+
+ $this->assertFalse( $result );
+ }
+
+ public function test_upload_is_user_over_quota_allowed_100_used_200() {
+ add_filter( 'get_space_allowed', array( $this, '_filter_space_100' ) );
+ add_filter( 'pre_get_space_used', array( $this, '_filter_space_200' ) );
+ $result = upload_is_user_over_quota( false );
+ remove_filter( 'get_space_allowed', array( $this, '_filter_space_100' ) );
+ remove_filter( 'pre_get_space_used', array( $this, '_filter_space_200' ) );
+
+ $this->assertTrue( $result );
+ }
+
+ public function test_upload_is_user_over_quota_allowed_negative_used_100() {
+ add_filter( 'get_space_allowed', array( $this, '_filter_space_negative' ) );
+ add_filter( 'pre_get_space_used', array( $this, '_filter_space_100' ) );
+ $result = upload_is_user_over_quota( false );
+ remove_filter( 'get_space_allowed', array( $this, '_filter_space_negative' ) );
+ remove_filter( 'pre_get_space_used', array( $this, '_filter_space_100' ) );
+
+ $this->assertTrue( $result );
+ }
+
+ /**
+ * When the upload space check is disabled, using more than the available
+ * quota is allowed.
+ */
+ public function test_upload_is_user_over_check_disabled() {
+ update_site_option( 'upload_space_check_disabled', true );
+
+ add_filter( 'get_space_allowed', array( $this, '_filter_space_100' ) );
+ add_filter( 'pre_get_space_used', array( $this, '_filter_space_200' ) );
+ $result = upload_is_user_over_quota( false );
+ remove_filter( 'get_space_allowed', array( $this, '_filter_space_100' ) );
+ remove_filter( 'pre_get_space_used', array( $this, '_filter_space_200' ) );
+
+ $this->assertFalse( $result );
+ }
+
+ public function _filter_space_5() {
+ return 5;
+ }
+
+ public function _filter_space_100() {
+ return 100;
+ }
+
+ public function _filter_space_200() {
+ return 200;
+ }
+
+ public function _filter_space_negative() {
+ return -1;
+ }
+}
+
+endif;
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>