vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-06 21:54:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: Use assertSame() in some newly introduced tests.

Browse Source 
This ensures that not only the return values match the expected results, but also that their type is the same.

Going forward, stricter type checking by using `assertSame()` should generally be preferred to `assertEquals()` where appropriate, to make the tests more reliable.

Follow-up to [49904], [49925], [49992], [50012], [50013], [50065], [50075], [50131], [50150], [50157].

See #38266, #52482.

git-svn-id: https://develop.svn.wordpress.org/trunk@50284 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2021-02-10 13:24:24 +00:00
parent 62d5c54b67
commit 3d259c2b22
12 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/phpunit/tests/https-migration.php
View File

@@ -61,11 +61,11 @@ class Tests_HTTPS_Migration extends WP_UnitTestCase {
// Replaces URLs, including its encoded variant.
add_filter( 'wp_should_replace_insecure_home_url', '__return_true' );
$this->assertEquals( $https_content, wp_replace_insecure_home_url( $http_content ) );
$this->assertSame( $https_content, wp_replace_insecure_home_url( $http_content ) );
// Does not replace anything if determined as unnecessary.
add_filter( 'wp_should_replace_insecure_home_url', '__return_false' );
$this->assertEquals( $http_content, wp_replace_insecure_home_url( $http_content ) );
$this->assertSame( $http_content, wp_replace_insecure_home_url( $http_content ) );
}
/**
@@ -86,8 +86,8 @@ class Tests_HTTPS_Migration extends WP_UnitTestCase {
// Update URLs to HTTPS (successfully).
$this->assertTrue( wp_update_urls_to_https() );
$this->assertEquals( $https_url, get_option( 'home' ) );
$this->assertEquals( $https_url, get_option( 'siteurl' ) );
$this->assertSame( $https_url, get_option( 'home' ) );
$this->assertSame( $https_url, get_option( 'siteurl' ) );
// Switch options back to use HTTP URLs, but now add filter to
// force option value which will make the update irrelevant.
@@ -98,8 +98,8 @@ class Tests_HTTPS_Migration extends WP_UnitTestCase {
// Update URLs to HTTPS. While the update technically succeeds, it does not take effect due to the enforced
// option. Therefore the change is expected to be reverted.
$this->assertFalse( wp_update_urls_to_https() );
$this->assertEquals( $http_url, get_option( 'home' ) );
$this->assertEquals( $http_url, get_option( 'siteurl' ) );
$this->assertSame( $http_url, get_option( 'home' ) );
$this->assertSame( $http_url, get_option( 'siteurl' ) );
}
/**
@@ -109,7 +109,7 @@ class Tests_HTTPS_Migration extends WP_UnitTestCase {
// Changing HTTP to HTTPS on a site with content should result in flag being set, requiring migration.
update_option( 'fresh_site', '0' );
wp_update_https_migration_required( 'http://example.org', 'https://example.org' );
$this->assertEquals( '1', get_option( 'https_migration_required' ) );
$this->assertTrue( get_option( 'https_migration_required' ) );
// Changing another part than the scheme should delete/reset the flag because changing those parts (e.g. the
// domain) can have further implications.
@@ -119,7 +119,7 @@ class Tests_HTTPS_Migration extends WP_UnitTestCase {
// Changing HTTP to HTTPS on a site without content should result in flag being set, but not requiring migration.
update_option( 'fresh_site', '1' );
wp_update_https_migration_required( 'http://example.org', 'https://example.org' );
$this->assertEquals( '', get_option( 'https_migration_required' ) );
$this->assertFalse( get_option( 'https_migration_required' ) );
// Changing (back) from HTTPS to HTTP should delete/reset the flag.
wp_update_https_migration_required( 'https://example.org', 'http://example.org' );