<!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>[40543] trunk/tests/phpunit: Build/Test Tools: Introduce `skipWithoutMultisite()` and `skipWithMultisite`() methods into the test suite.</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/40543">40543</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/40543","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-23 21:57:31 +0000 (Sun, 23 Apr 2017)</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'>Build/Test Tools: Introduce `skipWithoutMultisite()` and `skipWithMultisite`() methods into the test suite.
This brings much needed uniformity to test skipping when a test requires Multisite or when a test should be excluded from running when Multisite is enabled.
Used in conjunction with the `@group ms-required` and `@group ms-excluded` notation, this removes a significant number of skipped tests from the default test suite run.
Fixes <a href="https://core.trac.wordpress.org/ticket/40531">#40531</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestsadminbarphp">trunk/tests/phpunit/tests/adminbar.php</a></li>
<li><a href="#trunktestsphpunittestscustomizesettingphp">trunk/tests/phpunit/tests/customize/setting.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
<li><a href="#trunktestsphpunittestsgeneraltemplatephp">trunk/tests/phpunit/tests/general/template.php</a></li>
<li><a href="#trunktestsphpunittestsl10ngetLocalephp">trunk/tests/phpunit/tests/l10n/getLocale.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetDashboardUrlphp">trunk/tests/phpunit/tests/link/getDashboardUrl.php</a></li>
<li><a href="#trunktestsphpunittestsoembedcontrollerphp">trunk/tests/phpunit/tests/oembed/controller.php</a></li>
<li><a href="#trunktestsphpunittestsoptionnetworkOptionphp">trunk/tests/phpunit/tests/option/networkOption.php</a></li>
<li><a href="#trunktestsphpunittestsoptionsiteTransientphp">trunk/tests/phpunit/tests/option/siteTransient.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestuserscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-users-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrewritephp">trunk/tests/phpunit/tests/rewrite.php</a></li>
<li><a href="#trunktestsphpunitteststhemeWPThemephp">trunk/tests/phpunit/tests/theme/WPTheme.php</a></li>
<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>
<li><a href="#trunktestsphpunittestsusercountUsersphp">trunk/tests/phpunit/tests/user/countUsers.php</a></li>
<li><a href="#trunktestsphpunittestsuserqueryphp">trunk/tests/phpunit/tests/user/query.php</a></li>
<li><a href="#trunktestsphpunittestsuserwpAuthenticateSpamCheckphp">trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php</a></li>
<li><a href="#trunktestsphpunittestsuserwpDeleteUserphp">trunk/tests/phpunit/tests/user/wpDeleteUser.php</a></li>
<li><a href="#trunktestsphpunittestsuserwpGetUsersWithNoRolephp">trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/includes/testcase.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,6 +198,28 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Allow tests to be skipped when Multisite is not in use.
+ *
+ * Use in conjunction with the ms-required group.
+ */
+ public function skipWithoutMultisite() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'Test only runs on Multisite' );
+ }
+ }
+
+ /**
+ * Allow tests to be skipped when Multisite is in use.
+ *
+ * Use in conjunction with the ms-excluded group.
+ */
+ public function skipWithMultisite() {
+ if ( is_multisite() ) {
+ $this->markTestSkipped( 'Test does not run on Multisite' );
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Unregister existing post types and register defaults.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Run before each test in order to clean up the global scope, in case
</span></span></pre></div>
<a id="trunktestsphpunittestsadminbarphp"></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/adminbar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/adminbar.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/adminbar.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,9 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_admin_bar_contains_correct_links_for_users_with_no_role() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Test does not run in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( self::$no_role_id, 'read' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,9 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_admin_bar_contains_correct_links_for_users_with_role() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Test does not run in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( self::$editor_id, 'read' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,9 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => self::$admin_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,9 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_network() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( self::$admin_id, 'read' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( self::$no_role_id, 'read' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,9 +424,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_admin_bar_contains_correct_about_link_for_users_with_role() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Test does not run in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,9 +443,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_admin_bar_contains_correct_about_link_for_users_with_no_role() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Test does not run in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$no_role_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,9 +464,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_admin_bar_contains_correct_about_link_for_users_with_no_role_in_multisite() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // User is not a member of a site.
</span><span class="cx" style="display: block; padding: 0 10px"> remove_user_from_blog( self::$no_role_id, get_current_blog_id() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,9 +582,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_my_sites_network_menu_for_regular_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,9 +599,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_my_sites_network_menu_for_super_admin() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,12 +618,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_my_sites_network_menu_for_regular_user_with_network_caps() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> global $current_user;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $network_user_caps = array( 'manage_network', 'manage_network_themes', 'manage_network_plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor_id );
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizesettingphp"></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/customize/setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/setting.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/customize/setting.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,9 +564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_previewing_with_switch_to_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Cannot test WP_Customize_Setting::is_current_blog_previewed() with switch_to_blog() if not on multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'option';
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/functions.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -938,14 +938,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_check_filetype_and_ext_with_filtered_svg() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! extension_loaded( 'fileinfo' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
</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">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Test does not run in multisite' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/uploads/video-play.svg';
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = 'video-play.svg';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -964,16 +962,15 @@
</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"> * @ticket 39550
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-excluded
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_check_filetype_and_ext_with_filtered_woff() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! extension_loaded( 'fileinfo' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
</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">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Test does not run in multisite' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/uploads/dashicons.woff';
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = 'dashicons.woff';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneraltemplatephp"></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/general/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/template.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/general/template.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,9 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_has_site_icon_returns_true_when_called_for_other_site_with_site_icon_set() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,9 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_has_site_icon_returns_false_when_called_for_other_site_without_site_icon_set() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,9 +265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_has_custom_logo_returns_true_when_called_for_other_site_with_custom_logo_set() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,9 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_has_custom_logo_returns_false_when_called_for_other_site_without_custom_logo_set() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,9 +311,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_custom_logo_returns_logo_when_called_for_other_site_with_custom_logo_set() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,9 +532,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_site_icon_url_preserves_switched_state() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,9 +553,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_has_custom_logo_preserves_switched_state() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,9 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_custom_logo_preserves_switched_state() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $this->factory->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsl10ngetLocalephp"></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/l10n/getLocale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/getLocale.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/l10n/getLocale.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,9 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_local_option_should_take_precedence_on_multisite() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' requires Multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $locale;
</span><span class="cx" style="display: block; padding: 0 10px"> $old_locale = $locale;
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetDashboardUrlphp"></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/link/getDashboardUrl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getDashboardUrl.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/link/getDashboardUrl.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,9 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_dashboard_url_for_network_administrator_with_no_sites() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> grant_super_admin( self::$user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,9 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_dashboard_url_for_administrator_of_different_site() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_id = self::factory()->blog->create( array( 'user_id' => self::$user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedcontrollerphp"></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/oembed/controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/controller.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/oembed/controller.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,9 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_request_ms_child_in_root_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $child = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $child );
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionnetworkOptionphp"></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/option/networkOption.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/networkOption.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/option/networkOption.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,9 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_add_network_option_not_available_on_other_network() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test requires multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->network->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $option = __FUNCTION__;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,9 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_add_network_option_available_on_same_network() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test requires multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->network->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $option = __FUNCTION__;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,9 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_delete_network_option_on_only_one_network() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test requires multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->network->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $option = __FUNCTION__;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,12 +61,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_network_option_is_not_stored_as_autoload_option() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Does not apply when used in multisite.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> add_network_option( null, $key, 'Not an autoload option' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options = wp_load_alloptions();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,12 +77,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_network_option_is_not_stored_as_autoload_option() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Does not apply when used in multisite.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> update_network_option( null, $key, 'Not an autoload option' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options = wp_load_alloptions();
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionsiteTransientphp"></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/option/siteTransient.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/siteTransient.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/option/siteTransient.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,11 +47,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_set_site_transient_is_not_stored_as_autoload_option() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = 'not_autoloaded';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Does not apply when used in multisite.' );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> set_site_transient( $key, 'Not an autoload option' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options = wp_load_alloptions();
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestuserscontrollerphp"></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/rest-api/rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -996,9 +996,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_create_new_network_user_on_site_does_not_add_user_to_sub_site() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->allow_user_to_manage_multisite();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1028,9 +1026,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_create_new_network_user_on_sub_site_adds_user_to_site() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->allow_user_to_manage_multisite();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,9 +1060,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_create_existing_network_user_on_sub_site_has_error() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->allow_user_to_manage_multisite();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1454,9 +1448,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_user_role_invalid_privilege_deescalation() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- return $this->markTestSkipped( 'Test only intended for single site.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1487,9 +1479,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_user_role_privilege_deescalation_multisite() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- return $this->markTestSkipped( 'Test only intended for multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2238,9 +2228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_item_from_different_site_as_site_administrator() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( self::$site );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $this->factory->user->create( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2260,9 +2248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_item_from_different_site_as_network_administrator() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( self::$site );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $this->factory->user->create( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2282,9 +2268,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item_from_different_site_as_site_administrator() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( self::$site );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $this->factory->user->create( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2306,9 +2290,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item_from_different_site_as_network_administrator() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( self::$site );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $this->factory->user->create( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2330,9 +2312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_delete_item_from_different_site_as_site_administrator() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( self::$site );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $this->factory->user->create( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2354,9 +2334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_delete_item_from_different_site_as_network_administrator() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( self::$site );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $this->factory->user->create( array(
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritephp"></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/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/rewrite.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,9 +122,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_url_to_postid_of_http_site_when_current_site_uses_https() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'on';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,11 +317,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_url_to_postid_ms_home_url_collision() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'test_url_to_postid_ms_home_url_collision requires multisite' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array( 'path' => '/example' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststhemeWPThemephp"></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/theme/WPTheme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/WPTheme.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/theme/WPTheme.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,9 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_theme_network_enable_single_theme() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = 'testtheme-1';
</span><span class="cx" style="display: block; padding: 0 10px"> $current_allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,9 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_theme_network_enable_multiple_themes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $themes = array( 'testtheme-2', 'testtheme-3' );
</span><span class="cx" style="display: block; padding: 0 10px"> $current_allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,9 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_network_disable_single_theme() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,9 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_network_disable_multiple_themes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test requires multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_allowed_themes = get_site_option( 'allowedthemes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsusercapabilitiesphp"></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/user/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/capabilities.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,9 +615,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_super_admin_caps() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $caps = $this->getAllCapsAndRoles();
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::$super_admin;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1361,9 +1360,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_borked_current_user_can_for_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $orig_blog_id = get_current_blog_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1424,9 +1421,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_multisite_administrator_can_not_edit_users() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['administrator'];
</span><span class="cx" style="display: block; padding: 0 10px"> $other_user = self::$users['subscriber'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1460,9 +1455,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_only_super_admins_can_delete_users_on_multisite() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs on multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( self::$super_admin->ID, 'delete_user', self::$users['subscriber']->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1477,9 +1470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_only_admins_can_delete_users_on_single_site() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Test does not run on multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( self::$users['administrator']->ID, 'delete_user', self::$users['subscriber']->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1538,9 +1529,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_multisite_administrator_with_manage_network_users_can_edit_users() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['administrator'];
</span><span class="cx" style="display: block; padding: 0 10px"> $user->add_cap( 'manage_network_users' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1559,9 +1548,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_multisite_administrator_with_manage_network_users_can_not_edit_super_admin() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['administrator'];
</span><span class="cx" style="display: block; padding: 0 10px"> $user->add_cap( 'manage_network_users' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1783,9 +1770,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_only_super_admins_can_remove_themselves_on_multisite() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test only runs in multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( self::$super_admin->ID, 'remove_user', self::$super_admin->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsusercountUsersphp"></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/user/countUsers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/countUsers.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/user/countUsers.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,11 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_count_users_is_accurate( $strategy ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Test does not run on multisite' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Setup users
</span><span class="cx" style="display: block; padding: 0 10px"> $admin = self::factory()->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,11 +60,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_count_users_strategies
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_count_users_multisite_is_accurate( $strategy ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test requires multisite' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Setup users
</span><span class="cx" style="display: block; padding: 0 10px"> $admin = self::factory()->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator',
</span></span></pre></div>
<a id="trunktestsphpunittestsuserqueryphp"></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/user/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/query.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/user/query.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,9 +555,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_roles_and_caps_should_be_populated_for_explicit_value_of_blog_id_on_nonms() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' is a non-multisite-only test.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => self::$author_ids[0],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -576,9 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_roles_and_caps_should_be_populated_for_explicit_value_of_current_blog_id_on_ms() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => self::$author_ids[0],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,9 +593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_roles_and_caps_should_be_populated_for_explicit_value_of_different_blog_id_on_ms_when_fields_all_with_meta() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $b = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,9 +618,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_roles_and_caps_should_be_populated_for_explicit_value_of_different_blog_id_on_ms_when_fields_all() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $b = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $b, self::$author_ids[0], 'author' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,9 +642,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_who_authors() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $b = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,9 +667,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_who_authors_should_work_alongside_meta_query() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $b = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -713,9 +701,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_who_authors_should_work_alongside_meta_params() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $b = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -807,9 +793,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_has_published_posts_should_respect_blog_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = self::factory()->blog->create_many( 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1375,9 +1359,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_blog_id_should_restrict_by_blog_without_requiring_a_named_role() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sites = self::factory()->blog->create_many( 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1398,9 +1380,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_calling_prepare_query_a_second_time_should_not_add_another_cap_query_on_multisite() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' requires Multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_id = get_current_blog_id();
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $site_id, self::$author_ids[0], 'author' );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpAuthenticateSpamCheckphp"></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/user/wpAuthenticateSpamCheck.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,9 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_authenticate_spam_check_returns_user_when_single_site() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'This test applies to single site only.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'contributor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $user_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,9 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_authenticate_spam_check_returns_user_when_not_flagged() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test applies to multisite only.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'contributor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $user_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,9 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_authenticate_spam_check_returns_wp_error_when_flagged() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'This test applies to multisite only.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'contributor' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_status( $user_id, 'spam', 1 );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpDeleteUserphp"></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/user/wpDeleteUser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpDeleteUser.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/user/wpDeleteUser.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,9 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_numeric_string_user_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'wp_delete_user() does not delete user records in Multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $u = self::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,9 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_return_false_for_object_user_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'wp_delete_user() does not delete user records in Multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $u_obj = self::factory()->user->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_delete_user( $u_obj ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpGetUsersWithNoRolephp"></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/user/wpGetUsersWithNoRole.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,11 +10,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-excluded
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_users_with_no_role_is_accurate() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $this->markTestSkipped( 'Test does not run on multisite' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Setup users
</span><span class="cx" style="display: block; padding: 0 10px"> $admin = self::factory()->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,11 +42,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_users_with_no_role_multisite_is_accurate() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( 'Test requires multisite' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Setup users
</span><span class="cx" style="display: block; padding: 0 10px"> $admin = self::factory()->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'administrator',
</span></span></pre></div>
<a id="trunktestsphpunittestsuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2017-04-23 21:34:37 UTC (rev 40542)
+++ trunk/tests/phpunit/tests/user.php 2017-04-23 21:57:31 UTC (rev 40543)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -652,9 +652,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ms-required
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_illegal_user_logins_multisite() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_multisite() ) {
- $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->skipWithoutMultisite();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'testuser',
</span></span></pre>
</div>
</div>
</body>
</html>