vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 12:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build/Test Tools: Introduce skipWithoutMultisite() and skipWithMultisite() methods into the test suite.

Browse Source 
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 #40531


git-svn-id: https://develop.svn.wordpress.org/trunk@40543 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn
2017-04-23 21:57:31 +00:00
parent e3a9d87083
commit 64f8351da1
20 changed files with 106 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/tests/adminbar.php
+11 -31
View File
@@ -75,9 +75,7 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-excluded
*/
public function test_admin_bar_contains_correct_links_for_users_with_no_role() {
if ( is_multisite() ) {
$this->markTestSkipped( 'Test does not run in multisite' );
}
$this->skipWithMultisite();
$this->assertFalse( user_can( self::$no_role_id, 'read' ) );
@@ -104,9 +102,7 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-excluded
*/
public function test_admin_bar_contains_correct_links_for_users_with_role() {
if ( is_multisite() ) {
$this->markTestSkipped( 'Test does not run in multisite' );
}
$this->skipWithMultisite();
$this->assertTrue( user_can( self::$editor_id, 'read' ) );
@@ -136,9 +132,7 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_blog() {
if ( ! is_multisite() ) {
$this->markTestSkipped( 'Test only runs in multisite' );
}
$this->skipWithoutMultisite();
$blog_id = self::factory()->blog->create( array(
'user_id' => self::$admin_id,
@@ -187,9 +181,7 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_network() {
if ( ! is_multisite() ) {
$this->markTestSkipped( 'Test only runs in multisite' );
}
$this->skipWithoutMultisite();
$this->assertTrue( user_can( self::$admin_id, 'read' ) );
$this->assertFalse( user_can( self::$no_role_id, 'read' ) );
@@ -432,9 +424,7 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-excluded
*/
public function test_admin_bar_contains_correct_about_link_for_users_with_role() {
if ( is_multisite() ) {
$this->markTestSkipped( 'Test does not run in multisite' );
}
$this->skipWithMultisite();
wp_set_current_user( self::$editor_id );
@@ -453,9 +443,7 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-excluded
*/
public function test_admin_bar_contains_correct_about_link_for_users_with_no_role() {
if ( is_multisite() ) {
$this->markTestSkipped( 'Test does not run in multisite' );
}
$this->skipWithMultisite();
wp_set_current_user( self::$no_role_id );
@@ -476,9 +464,7 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_admin_bar_contains_correct_about_link_for_users_with_no_role_in_multisite() {
if ( ! is_multisite() ) {
$this->markTestSkipped( 'Test only runs in multisite' );
}
$this->skipWithoutMultisite();
// User is not a member of a site.
remove_user_from_blog( self::$no_role_id, get_current_blog_id() );
@@ -596,9 +582,7 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_my_sites_network_menu_for_regular_user() {
if ( ! is_multisite() ) {
$this->markTestSkipped( 'Test only runs in multisite' );
}
$this->skipWithoutMultisite();
wp_set_current_user( self::$editor_id );
@@ -615,9 +599,7 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_my_sites_network_menu_for_super_admin() {
if ( ! is_multisite() ) {
$this->markTestSkipped( 'Test only runs in multisite' );
}
$this->skipWithoutMultisite();
wp_set_current_user( self::$editor_id );
@@ -636,11 +618,9 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_my_sites_network_menu_for_regular_user_with_network_caps() {
global $current_user;
$this->skipWithoutMultisite();
if ( ! is_multisite() ) {
$this->markTestSkipped( 'Test only runs in multisite' );
}
global $current_user;
$network_user_caps = array( 'manage_network', 'manage_network_themes', 'manage_network_plugins' );