Changeset 38838

Timestamp:

10/20/2016 09:06:11 AM (8 years ago)

Author:

pento

Message:

Tests: Fix tests that don't pass when Twenty Seventeen is the default theme.

There are some tests who's outcome can be affected by the default theme, so we need to ensure the Twenty Seventeen functionality is unhooked while the tests are running.

See #38372.

Location:

trunk/tests/phpunit/tests

Files:

• customize/widgets.php (modified) (1 diff)
• media.php (modified) (2 diffs)

trunk/tests/phpunit/tests/customize/widgets.php

@@ -45 +45 @@
         remove_action( 'after_setup_theme', 'twentysixteen_setup' );
         remove_action( 'customize_register', 'twentysixteen_customize_register', 11 );
+        remove_action( 'after_setup_theme', 'twentyseventeen_setup' );
 
         $this->backup_registered_sidebars = $GLOBALS['wp_registered_sidebars'];

trunk/tests/phpunit/tests/media.php

@@ -34 +34 @@
         $this->img_html = '<img src="' . $this->img_url . '"/>';
         $this->img_meta = array( 'width' => 100, 'height' => 100, 'sizes' => '' );
+
+        // Disable Twenty Seventeen changes to the image size attribute
+        remove_filter( 'wp_calculate_image_sizes', 'twentyseventeen_content_image_sizes_attr' );
+        remove_filter( 'wp_get_attachment_image_attributes', 'twentyseventeen_post_thumbnail_sizes_attr' );
+    }
+
+    function tearDown() {
+        parent::tearDown();
+
+        // Reset Twenty Seventeen behaviour
+        add_filter( 'wp_calculate_image_sizes', 'twentyseventeen_content_image_sizes_attr', 10, 2 );
+        add_filter( 'wp_get_attachment_image_attributes', 'twentyseventeen_post_thumbnail_sizes_attr', 10, 3 );
     }
 
@@ -56 +68 @@
             array( 'width' => 20, 'caption' => $this->caption )
         );
+
         $this->assertEquals( 2, preg_match_all( '/wp-caption/', $result, $_r ) );
         $this->assertEquals( 1, preg_match_all( '/alignnone/', $result, $_r ) );
         $this->assertEquals( 1, preg_match_all( "/{$this->caption}/", $result, $_r ) );
-        $this->assertEquals( 1, preg_match_all( "/width: 30/", $result, $_r ) );
+
+        if ( current_theme_supports( 'html5', 'caption' ) ) {
+            $this->assertEquals( 1, preg_match_all( "/width: 20/", $result, $_r ) );
+        } else {
+            $this->assertEquals( 1, preg_match_all( "/width: 30/", $result, $_r ) );
+        }
     }