vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-03-31 10:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build/Test Tools: Automatically skip tests in the ms-required and ms-excluded groups.

Browse Source 
This removes the need to manually call `$this->skipWithMultisite()` and `$this->skipWithoutMultisite()` from within the test when the test only runs without Multisite or only runs on Multisite, respectively.

Props jdgrimes for the suggestion.

Fixes #40531


git-svn-id: https://develop.svn.wordpress.org/trunk@40564 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn
2017-05-01 20:34:10 +00:00
parent f72ce6dc6e
commit c759785cea
20 changed files with 11 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/phpunit/tests/adminbar.php
View File

@@ -75,8 +75,6 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-excluded
*/
public function test_admin_bar_contains_correct_links_for_users_with_no_role() {
$this->skipWithMultisite();
$this->assertFalse( user_can( self::$no_role_id, 'read' ) );
wp_set_current_user( self::$no_role_id );
@@ -102,8 +100,6 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-excluded
*/
public function test_admin_bar_contains_correct_links_for_users_with_role() {
$this->skipWithMultisite();
$this->assertTrue( user_can( self::$editor_id, 'read' ) );
wp_set_current_user( self::$editor_id );
@@ -132,8 +128,6 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_blog() {
$this->skipWithoutMultisite();
$blog_id = self::factory()->blog->create( array(
'user_id' => self::$admin_id,
) );
@@ -181,8 +175,6 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_network() {
$this->skipWithoutMultisite();
$this->assertTrue( user_can( self::$admin_id, 'read' ) );
$this->assertFalse( user_can( self::$no_role_id, 'read' ) );
@@ -424,8 +416,6 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-excluded
*/
public function test_admin_bar_contains_correct_about_link_for_users_with_role() {
$this->skipWithMultisite();
wp_set_current_user( self::$editor_id );
$wp_admin_bar = $this->get_standard_admin_bar();
@@ -443,8 +433,6 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-excluded
*/
public function test_admin_bar_contains_correct_about_link_for_users_with_no_role() {
$this->skipWithMultisite();
wp_set_current_user( self::$no_role_id );
$wp_admin_bar = $this->get_standard_admin_bar();
@@ -464,8 +452,6 @@ 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() {
$this->skipWithoutMultisite();
// User is not a member of a site.
remove_user_from_blog( self::$no_role_id, get_current_blog_id() );
@@ -582,8 +568,6 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_my_sites_network_menu_for_regular_user() {
$this->skipWithoutMultisite();
wp_set_current_user( self::$editor_id );
$wp_admin_bar = $this->get_standard_admin_bar();
@@ -599,8 +583,6 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_my_sites_network_menu_for_super_admin() {
$this->skipWithoutMultisite();
wp_set_current_user( self::$editor_id );
grant_super_admin( self::$editor_id );
@@ -618,8 +600,6 @@ class Tests_AdminBar extends WP_UnitTestCase {
* @group ms-required
*/
public function test_my_sites_network_menu_for_regular_user_with_network_caps() {
$this->skipWithoutMultisite();
global $current_user;
$network_user_caps = array( 'manage_network', 'manage_network_themes', 'manage_network_plugins' );