<!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>[40520] trunk: Build/Test Tools: Introduce `ms-required` and `ms-excluded` groups for tests.</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/40520">40520</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/40520","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-22 18:58:46 +0000 (Sat, 22 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 `ms-required` and `ms-excluded` groups for tests.
Tests in the `ms-excluded` group are now excluded when running tests with multisite enabled, and tests in the `ms-required` group are excluded when running tests without multisite enabled. The end result is a significantly reduced number of skipped tests polluting PHPUnit's output, which means verbose mode can be used to more easily see which tests are skipped or incomplete, and why.
See <a href="https://core.trac.wordpress.org/ticket/40531">#40531</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkphpunitxmldist">trunk/phpunit.xml.dist</a></li>
<li><a href="#trunktestsphpunitmultisitexml">trunk/tests/phpunit/multisite.xml</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="#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="#trunktestsphpunittestsl10ngetUserLocalephp">trunk/tests/phpunit/tests/l10n/getUserLocale.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="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkphpunitxmldist"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/phpunit.xml.dist</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/phpunit.xml.dist 2017-04-22 18:44:18 UTC (rev 40519)
+++ trunk/phpunit.xml.dist 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,6 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> <group>ajax</group>
</span><span class="cx" style="display: block; padding: 0 10px"> <group>ms-files</group>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <group>ms-required</group>
</ins><span class="cx" style="display: block; padding: 0 10px"> <group>external-http</group>
</span><span class="cx" style="display: block; padding: 0 10px"> </exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> </groups>
</span></span></pre></div>
<a id="trunktestsphpunitmultisitexml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/multisite.xml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/multisite.xml 2017-04-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/multisite.xml 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,6 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <exclude>
</span><span class="cx" style="display: block; padding: 0 10px"> <group>ajax</group>
</span><span class="cx" style="display: block; padding: 0 10px"> <group>ms-files</group>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <group>ms-excluded</group>
</ins><span class="cx" style="display: block; padding: 0 10px"> <group>external-http</group>
</span><span class="cx" style="display: block; padding: 0 10px"> <group>oembed-headers</group>
</span><span class="cx" style="display: block; padding: 0 10px"> </exclude>
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/adminbar.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,6 +72,7 @@
</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 25162
</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"> public function test_admin_bar_contains_correct_links_for_users_with_no_role() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,6 +101,7 @@
</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 25162
</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"> public function test_admin_bar_contains_correct_links_for_users_with_role() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,6 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25162
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,6 +184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25162
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,6 +429,7 @@
</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 37949
</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"> public function test_admin_bar_contains_correct_about_link_for_users_with_role() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,6 +450,7 @@
</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 37949
</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"> public function test_admin_bar_contains_correct_about_link_for_users_with_no_role() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,6 +473,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37949
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,6 +593,7 @@
</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 39082
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,6 +612,7 @@
</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 39082
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,6 +633,7 @@
</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 39082
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> global $current_user;
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/customize/setting.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -561,6 +561,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31428
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/general/template.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,6 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,6 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group site_icon
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,6 +266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group custom_logo
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,6 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group custom_logo
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,6 +316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group custom_logo
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,6 +539,7 @@
</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 38253
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,6 +562,7 @@
</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 38253
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,6 +585,7 @@
</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 38253
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/l10n/getLocale.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $found );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_local_option_should_take_precedence_on_multisite() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' requires Multisite' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,6 +38,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'en_GB', $found );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_network_option_should_be_fallback_on_multisite() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' requires Multisite' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +58,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'es_ES', $found );
</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">+ /**
+ * @group ms-excluded
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_option_should_be_respected_on_nonmultisite() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' does not apply to Multisite' );
</span></span></pre></div>
<a id="trunktestsphpunittestsl10ngetUserLocalephp"></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/getUserLocale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/getUserLocale.php 2017-04-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/l10n/getUserLocale.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,6 +66,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'en_US', get_locale() );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_user_locale_is_same_across_network() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' requires multisite' );
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/link/getDashboardUrl.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,6 +38,7 @@
</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 39065
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,6 +59,7 @@
</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 39065
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/oembed/controller.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,6 +253,7 @@
</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"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/option/networkOption.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Option_NetworkOption extends WP_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_add_network_option_not_available_on_other_network() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test requires multisite' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,6 +28,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_network_option( $id, $option, false ) );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_add_network_option_available_on_same_network() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test requires multisite' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +44,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $value, get_network_option( $id, $option, false ) );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_delete_network_option_on_only_one_network() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test requires multisite' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,6 +64,7 @@
</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 22846
</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"> public function test_add_network_option_is_not_stored_as_autoload_option() {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,6 +82,7 @@
</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 22846
</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"> public function test_update_network_option_is_not_stored_as_autoload_option() {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__;
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/option/siteTransient.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +44,7 @@
</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 22846
</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"> public function test_set_site_transient_is_not_stored_as_autoload_option() {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = 'not_autoloaded';
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -992,6 +992,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Sorry, that username is not allowed.', $errors['username'] );
</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">+ /**
+ * @group ms-required
+ */
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test requires multisite.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1021,6 +1024,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $user_is_member );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_create_new_network_user_on_sub_site_adds_user_to_site() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test requires multisite.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1054,6 +1060,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $user_is_member );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_create_existing_network_user_on_sub_site_has_error() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test requires multisite.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1441,6 +1450,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( 'administrator', $user->caps );
</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">+ /**
+ * @group ms-excluded
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_update_user_role_invalid_privilege_deescalation() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->markTestSkipped( 'Test only intended for single site.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1471,6 +1483,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( 'editor', $user->caps );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_update_user_role_privilege_deescalation_multisite() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->markTestSkipped( 'Test only intended for multisite.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2220,6 +2235,7 @@
</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 39701
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2241,6 +2257,7 @@
</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 39701
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2262,6 +2279,7 @@
</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 39701
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2285,6 +2303,7 @@
</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 39701
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2308,6 +2327,7 @@
</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 39701
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2331,6 +2351,7 @@
</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 39701
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/rewrite.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,6 +119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 35531
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,14 +316,12 @@
</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"> * Reveals bug introduced in WP 3.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * Run tests using multisite `phpunit -c multisite`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'test_url_to_postid_ms_home_url_collision requires multisite' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
</del><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"> $blog_id = self::factory()->blog->create( array( 'path' => '/example' ) );
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/theme/WPTheme.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,6 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Enable a single theme on a network.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30594
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,6 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Enable multiple themes on a network.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30594
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,6 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Disable a single theme on a network.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30594
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,6 +212,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Disable multiple themes on a network.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 30594
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,10 +611,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_super_admin_caps() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test only runs in multisite' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1355,10 +1357,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $old_uid );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_borked_current_user_can_for_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test only runs in multisite' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><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"> $orig_blog_id = get_current_blog_id();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1416,10 +1420,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( current_user_can( 'edit_post', $post + 1 ) );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_multisite_administrator_can_not_edit_users() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test only runs in multisite' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><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"> $user = self::$users['administrator'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1450,6 +1456,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( self::$users['subscriber']->ID, 'remove_user', self::$users['subscriber']->ID ) );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_only_super_admins_can_delete_users_on_multisite() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test only runs on multisite' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1464,6 +1473,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( user_can( self::$users['subscriber']->ID, 'delete_user', self::$users['subscriber']->ID ) );
</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">+ /**
+ * @group ms-excluded
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_only_admins_can_delete_users_on_single_site() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test does not run on multisite' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1522,10 +1534,12 @@
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_multisite_administrator_with_manage_network_users_can_edit_users() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test only runs in multisite' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><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"> $user = self::$users['administrator'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1541,10 +1555,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $can_edit_user );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_multisite_administrator_with_manage_network_users_can_not_edit_super_admin() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Test only runs in multisite' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><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"> $user = self::$users['administrator'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1764,6 +1780,7 @@
</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 39063
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/user/countUsers.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,6 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22993
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_count_users_strategies
</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"> public function test_count_users_is_accurate( $strategy ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,6 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22993
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</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></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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/user/query.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,6 +551,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'author' => true ), $user->caps );
</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">+ /**
+ * @group ms-required
+ */
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' is a non-multisite-only test.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,6 +572,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'author' => true ), $user->caps );
</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">+ /**
+ * @group ms-required
+ */
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,6 +593,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'author' => true ), $user->caps );
</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">+ /**
+ * @group ms-required
+ */
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,6 +621,7 @@
</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 31878
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -637,6 +647,7 @@
</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 32019
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,6 +674,7 @@
</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 32019
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -698,6 +710,7 @@
</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 36724
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -791,6 +804,7 @@
</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 32250
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1358,6 +1372,7 @@
</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 22212
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1380,6 +1395,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21119
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,6 +4,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group user
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_User_WpAuthenticateSpamCheck extends WP_UnitTestCase {
</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"> function test_wp_authenticate_spam_check_returns_user_when_single_site() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This test applies to single site only.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +21,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $user->user_login, $actual_user->user_login );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_wp_authenticate_spam_check_returns_user_when_not_flagged() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This test applies to multisite only.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,6 +37,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $user->user_login, $actual_user->user_login );
</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">+ /**
+ * @group ms-required
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_wp_authenticate_spam_check_returns_wp_error_when_flagged() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'This test applies to multisite only.' );
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/user/wpDeleteUser.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,6 +123,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $reassign, $post->post_author );
</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">+ /**
+ * @group ms-excluded
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_numeric_string_user_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'wp_delete_user() does not delete user records in Multisite.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,6 +147,7 @@
</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 33800
</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"> public function test_should_return_false_for_object_user_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</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-22 18:44:18 UTC (rev 40519)
+++ trunk/tests/phpunit/tests/user.php 2017-04-22 18:58:46 UTC (rev 40520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,6 +649,7 @@
</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 27317
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group ms-required
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span></span></pre>
</div>
</div>
</body>
</html>