WordPress.org

Make WordPress Core


Ignore:
Timestamp:
07/19/2021 02:00:11 PM (6 months ago)
Author:
SergeyBiryukov
Message:

Tests: Replace assertContains() with assertStringContainsString() when used with strings.

Using the assertContains() and assertNotContains() methods with string haystacks was deprecated in PHPUnit 8 and removed in PHPUnit 9.

While WordPress test suite currently only supports PHPUnit up to 7.5.x, this allows us to switch to newer assertions ahead of adding full support for PHPUnit 8+.

These methods introduced in PHPUnit 7.5 should be used as an alternative:

  • assertStringContainsString()
  • assertStringContainsStringIgnoringCase
  • assertStringNotContainsString()
  • assertStringNotContainsStringIgnoringCase

As WordPress currently uses PHPUnit 5.7.x to run tests on PHP 5.6, polyfills for these methods were added to the WP_UnitTestCase class for PHPUnit < 7.5.

Follow-up to [51331], [51451], [51461].

Props jrf, dd32, SergeyBiryukov.
See #53363, #46149.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php

    r51129 r51462  
    8686        $this->assertTrue( (bool) get_post_meta( $request_id, '_wp_admin_notified', true ) );
    8787        $this->assertSame( get_site_option( 'admin_email' ), $mailer->get_recipient( 'to' )->address );
    88         $this->assertContains( 'Action Confirmed', $mailer->get_sent()->subject );
    89         $this->assertContains( 'Request: Export Personal Data', $mailer->get_sent()->body );
    90         $this->assertContains( 'A user data privacy request has been confirmed', $mailer->get_sent()->body );
     88        $this->assertStringContainsString( 'Action Confirmed', $mailer->get_sent()->subject );
     89        $this->assertStringContainsString( 'Request: Export Personal Data', $mailer->get_sent()->body );
     90        $this->assertStringContainsString( 'A user data privacy request has been confirmed', $mailer->get_sent()->body );
    9191    }
    9292
     
    184184
    185185        $mailer = tests_retrieve_phpmailer_instance();
    186         $this->assertContains( 'Custom content containing email address:' . $email, $mailer->get_sent()->body );
     186        $this->assertStringContainsString( 'Custom content containing email address:' . $email, $mailer->get_sent()->body );
    187187    }
    188188
     
    229229        $mailer = tests_retrieve_phpmailer_instance();
    230230
    231         $this->assertContains( 'From: Tester <tester@example.com>', $mailer->get_sent()->header );
     231        $this->assertStringContainsString( 'From: Tester <tester@example.com>', $mailer->get_sent()->header );
    232232    }
    233233
Note: See TracChangeset for help on using the changeset viewer.