Changeset 40525

Timestamp:

04/22/2017 08:12:29 PM (9 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Replace test skipping with actual assertions when dealing with the DISALLOW_UNFILTERED_HTML, DISALLOW_FILE_MODS, and DISALLOW_FILE_EDIT constants.

If any of these constants are set during testing, they should cause the tests to fail, not to be skipped, otherwise we have a situation where failure conditions are never seen.

See #40533

File:

• trunk/tests/phpunit/tests/user/mapMetaCap.php (modified) (2 diffs)

trunk/tests/phpunit/tests/user/mapMetaCap.php

@@ -214 +214 @@
 
         function test_unfiltered_html_cap() {
-                if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-                        $this->markTestSkipped( 'DISALLOW_UNFILTERED_HTML is defined.' );
+                if ( defined( 'DISALLOW_UNFILTERED_HTML' ) ) {
+                        $this->assertFalse( DISALLOW_UNFILTERED_HTML );
+                }
+
                 if ( is_multisite() ) {
                         $this->assertEquals( array( 'do_not_allow' ), map_meta_cap( 'unfiltered_html', 0 ) );
@@ -228 +230 @@
          */
         function test_file_edit_caps_not_reliant_on_unfiltered_html_constant() {
-                if ( defined( 'DISALLOW_FILE_MODS' ) || defined( 'DISALLOW_FILE_EDIT' ) )
-                        $this->markTestSkipped('DISALLOW_FILE_MODS or DISALLOW_FILE_EDIT is defined.');
-
-                if ( defined( 'DISALLOW_UNFILTERED_HTML' ) ) {
-                        if ( ! DISALLOW_UNFILTERED_HTML )
-                                $this->markTestSkipped( 'DISALLOW_UNFILTERED_HTML is defined.' );
-                } else {
+                $this->assertFalse( defined( 'DISALLOW_FILE_MODS' ) );
+                $this->assertFalse( defined( 'DISALLOW_FILE_EDIT' ) );
+
+                if ( ! defined( 'DISALLOW_UNFILTERED_HTML' ) ) {
                         define( 'DISALLOW_UNFILTERED_HTML', true );
                 }
 
+                $this->assertTrue( DISALLOW_UNFILTERED_HTML );
                 $this->assertEquals( array( 'update_core' ), map_meta_cap( 'update_core', self::$user_id ) );
                 $this->assertEquals( array( 'edit_plugins' ), map_meta_cap( 'edit_plugins', self::$user_id ) );