Changeset 40564 for trunk/tests/phpunit/tests/user/query.php

Timestamp:

05/01/2017 08:34:10 PM (9 years ago)

Author:

johnbillion

Message:

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

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

File:

• trunk/tests/phpunit/tests/user/query.php (modified) (10 diffs)

trunk/tests/phpunit/tests/user/query.php

@@ -556 +556 @@
          */
         public function test_roles_and_caps_should_be_populated_for_explicit_value_of_blog_id_on_nonms() {
-                $this->skipWithMultisite();
-
                 $query = new WP_User_Query( array(
                         'include' => self::$author_ids[0],
@@ -575 +573 @@
          */
         public function test_roles_and_caps_should_be_populated_for_explicit_value_of_current_blog_id_on_ms() {
-                $this->skipWithoutMultisite();
-
                 $query = new WP_User_Query( array(
                         'include' => self::$author_ids[0],
@@ -594 +590 @@
          */
         public function test_roles_and_caps_should_be_populated_for_explicit_value_of_different_blog_id_on_ms_when_fields_all_with_meta() {
-                $this->skipWithoutMultisite();
-
                 $b = self::factory()->blog->create();
 
@@ -619 +613 @@
          */
         public function test_roles_and_caps_should_be_populated_for_explicit_value_of_different_blog_id_on_ms_when_fields_all() {
-                $this->skipWithoutMultisite();
-
                 $b = self::factory()->blog->create();
                 add_user_to_blog( $b, self::$author_ids[0], 'author' );
@@ -643 +635 @@
          */
         public function test_who_authors() {
-                $this->skipWithoutMultisite();
-
                 $b = self::factory()->blog->create();
 
@@ -668 +658 @@
          */
         public function test_who_authors_should_work_alongside_meta_query() {
-                $this->skipWithoutMultisite();
-
                 $b = self::factory()->blog->create();
 
@@ -702 +690 @@
          */
         public function test_who_authors_should_work_alongside_meta_params() {
-                $this->skipWithoutMultisite();
-
                 $b = self::factory()->blog->create();
 
@@ -794 +780 @@
          */
         public function test_has_published_posts_should_respect_blog_id() {
-                $this->skipWithoutMultisite();
-
                 $blogs = self::factory()->blog->create_many( 2 );
 
@@ -1360 +1344 @@
          */
         public function test_blog_id_should_restrict_by_blog_without_requiring_a_named_role() {
-                $this->skipWithoutMultisite();
-
                 $sites = self::factory()->blog->create_many( 2 );
 
@@ -1381 +1363 @@
          */
         public function test_calling_prepare_query_a_second_time_should_not_add_another_cap_query_on_multisite() {
-                $this->skipWithoutMultisite();
-
                 $site_id = get_current_blog_id();
                 add_user_to_blog( $site_id, self::$author_ids[0], 'author' );