Changeset 40564 for trunk/tests/phpunit/tests/general/template.php

Timestamp:

05/01/2017 08:34:10 PM (8 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/general/template.php (modified) (8 diffs)

trunk/tests/phpunit/tests/general/template.php

@@ -76 +76 @@
      */
     function test_has_site_icon_returns_true_when_called_for_other_site_with_site_icon_set() {
-        $this->skipWithoutMultisite();
-
         $blog_id = $this->factory->blog->create();
         switch_to_blog( $blog_id );
@@ -92 +90 @@
      */
     function test_has_site_icon_returns_false_when_called_for_other_site_without_site_icon_set() {
-        $this->skipWithoutMultisite();
-
         $blog_id = $this->factory->blog->create();
 
@@ -266 +262 @@
      */
     function test_has_custom_logo_returns_true_when_called_for_other_site_with_custom_logo_set() {
-        $this->skipWithoutMultisite();
-
         $blog_id = $this->factory->blog->create();
         switch_to_blog( $blog_id );
@@ -282 +276 @@
      */
     function test_has_custom_logo_returns_false_when_called_for_other_site_without_custom_logo_set() {
-        $this->skipWithoutMultisite();
-
         $blog_id = $this->factory->blog->create();
 
@@ -312 +304 @@
      */
     function test_get_custom_logo_returns_logo_when_called_for_other_site_with_custom_logo_set() {
-        $this->skipWithoutMultisite();
-
         $blog_id = $this->factory->blog->create();
         switch_to_blog( $blog_id );
@@ -533 +523 @@
      */
     function test_get_site_icon_url_preserves_switched_state() {
-        $this->skipWithoutMultisite();
-
         $blog_id = $this->factory->blog->create();
         switch_to_blog( $blog_id );
@@ -554 +542 @@
      */
     function test_has_custom_logo_preserves_switched_state() {
-        $this->skipWithoutMultisite();
-
         $blog_id = $this->factory->blog->create();
         switch_to_blog( $blog_id );
@@ -575 +561 @@
      */
     function test_get_custom_logo_preserves_switched_state() {
-        $this->skipWithoutMultisite();
-
         $blog_id = $this->factory->blog->create();
         switch_to_blog( $blog_id );