WordPress.org
Get WordPress

Make WordPress Core

Ticket #50640: 50640-1.patch

File 50640-1.patch, 4.2 KB (added by ayeshrajans, 6 years ago)

  • tests/phpunit/tests/functions/deprecated.php 

    diff --git a/tests/phpunit/tests/functions/deprecated.php b/tests/phpunit/tests/functions/deprecated.php
index 758ab0228a..843c68bf48 100644
    a b protected function was_deprecated( $type, $name ) { 
    143143         */
    144144        public function test_wp_save_image_file_deprecated_with_gd_resource() {
    145145                if ( ! function_exists( 'imagejpeg' ) ) {
    146                         $this->fail( 'jpeg support unavailable' );
     146                        $this->markTestSkipped( 'jpeg support unavailable' );
    147147                }
    148148
    149149                // Call wp_save_image_file().
    … … public function test_wp_save_image_file_deprecated_with_gd_resource() { 
    166166         */
    167167        public function test_wp_save_image_file_not_deprecated_with_wp_image_editor() {
    168168                if ( ! function_exists( 'imagejpeg' ) ) {
    169                         $this->fail( 'jpeg support unavailable' );
     169                        $this->markTestSkipped( 'jpeg support unavailable' );
    170170                }
    171171
    172172                // Call wp_save_image_file().

  • tests/phpunit/tests/image/functions.php 

    diff --git a/tests/phpunit/tests/image/functions.php b/tests/phpunit/tests/image/functions.php
index 4a7713d52b..a8fdf52b10 100644
    a b public function test_load_directory() { 
    303303
    304304        public function test_wp_crop_image_file() {
    305305                if ( ! function_exists( 'imagejpeg' ) ) {
    306                         $this->fail( 'jpeg support unavailable' );
     306                        $this->markTestSkipped( 'jpeg support unavailable' );
    307307                }
    308308
    309309                $file = wp_crop_image(
    … … public function test_wp_crop_image_file() { 
    327327
    328328        public function test_wp_crop_image_url() {
    329329                if ( ! function_exists( 'imagejpeg' ) ) {
    330                         $this->fail( 'jpeg support unavailable' );
     330                        $this->markTestSkipped( 'jpeg support unavailable' );
    331331                }
    332332
    333333                if ( ! extension_loaded( 'openssl' ) ) {

  • tests/phpunit/tests/image/intermediateSize.php 

    diff --git a/tests/phpunit/tests/image/intermediateSize.php b/tests/phpunit/tests/image/intermediateSize.php
index c7d8307afc..f20a4046e6 100644
    a b function test_make_intermediate_size_no_size() { 
    3030
    3131        function test_make_intermediate_size_width() {
    3232                if ( ! function_exists( 'imagejpeg' ) ) {
    33                         $this->fail( 'jpeg support unavailable' );
     33                        $this->markTestSkipped( 'jpeg support unavailable' );
    3434                }
    3535
    3636                $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 0, false );
    … … function test_make_intermediate_size_width() { 
    4040
    4141        function test_make_intermediate_size_height() {
    4242                if ( ! function_exists( 'imagejpeg' ) ) {
    43                         $this->fail( 'jpeg support unavailable' );
     43                        $this->markTestSkipped( 'jpeg support unavailable' );
    4444                }
    4545
    4646                $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 0, 75, false );
    … … function test_make_intermediate_size_height() { 
    5050
    5151        function test_make_intermediate_size_successful() {
    5252                if ( ! function_exists( 'imagejpeg' ) ) {
    53                         $this->fail( 'jpeg support unavailable' );
     53                        $this->markTestSkipped( 'jpeg support unavailable' );
    5454                }
    5555
    5656                $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 75, true );

  • tests/phpunit/tests/post/attachments.php 

    diff --git a/tests/phpunit/tests/post/attachments.php b/tests/phpunit/tests/post/attachments.php
index 8acb0b0068..2c30ab6097 100644
    a b function test_insert_image_no_thumb() { 
    5656
    5757        function test_insert_image_thumb_only() {
    5858                if ( ! function_exists( 'imagejpeg' ) ) {
    59                         $this->fail( 'jpeg support unavailable' );
     59                        $this->markTestSkipped( 'jpeg support unavailable' );
    6060                }
    6161
    6262                update_option( 'medium_size_w', 0 );
    … … function test_insert_image_thumb_only() { 
    108108
    109109        function test_insert_image_medium_sizes() {
    110110                if ( ! function_exists( 'imagejpeg' ) ) {
    111                         $this->fail( 'jpeg support unavailable' );
     111                        $this->markTestSkipped( 'jpeg support unavailable' );
    112112                }
    113113
    114114                update_option( 'medium_size_w', 400 );
    … … function test_insert_image_medium_sizes() { 
    167167
    168168        function test_insert_image_delete() {
    169169                if ( ! function_exists( 'imagejpeg' ) ) {
    170                         $this->fail( 'jpeg support unavailable' );
     170                        $this->markTestSkipped( 'jpeg support unavailable' );
    171171                }
    172172
    173173                update_option( 'medium_size_w', 400 );