mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-05 04:33:18 +02:00
Code Issues Actions 10 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 [50380], [50959], [50960], [50973], [50993], [51003], [51051], [51054].

See #52482.

git-svn-id: https://develop.svn.wordpress.org/trunk@51079 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2021-06-07 11:16:29 +00:00
parent b61653f944
commit 37a4faa7ed
10 changed files with 137 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/phpunit/tests/block-template-utils.php
View File

@ -40,14 +40,14 @@ class Block_Template_Utils_Test extends WP_UnitTestCase {
);
$this->assertNotWPError( $template );
$this->assertEquals( get_stylesheet() . '//my_template', $template->id );
$this->assertEquals( get_stylesheet(), $template->theme );
$this->assertEquals( 'my_template', $template->slug );
$this->assertEquals( 'publish', $template->status );
$this->assertEquals( 'custom', $template->source );
$this->assertEquals( 'My Template', $template->title );
$this->assertEquals( 'Description of my template', $template->description );
$this->assertEquals( 'wp_template', $template->type );
$this->assertSame( get_stylesheet() . '//my_template', $template->id );
$this->assertSame( get_stylesheet(), $template->theme );
$this->assertSame( 'my_template', $template->slug );
$this->assertSame( 'publish', $template->status );
$this->assertSame( 'custom', $template->source );
$this->assertSame( 'My Template', $template->title );
$this->assertSame( 'Description of my template', $template->description );
$this->assertSame( 'wp_template', $template->type );
}
/**
@ -56,12 +56,12 @@ class Block_Template_Utils_Test extends WP_UnitTestCase {
function test_get_block_template_from_post() {
$id = get_stylesheet() . '//' . 'my_template';
$template = get_block_template( $id, 'wp_template' );
$this->assertEquals( $id, $template->id );
$this->assertEquals( get_stylesheet(), $template->theme );
$this->assertEquals( 'my_template', $template->slug );
$this->assertEquals( 'publish', $template->status );
$this->assertEquals( 'custom', $template->source );
$this->assertEquals( 'wp_template', $template->type );
$this->assertSame( $id, $template->id );
$this->assertSame( get_stylesheet(), $template->theme );
$this->assertSame( 'my_template', $template->slug );
$this->assertSame( 'publish', $template->status );
$this->assertSame( 'custom', $template->source );
$this->assertSame( 'wp_template', $template->type );
}
/**
@ -87,11 +87,11 @@ class Block_Template_Utils_Test extends WP_UnitTestCase {
// Filter by slug.
$templates = get_block_templates( array( 'slug__in' => array( 'my_template' ) ), 'wp_template' );
$template_ids = get_template_ids( $templates );
$this->assertEquals( array( get_stylesheet() . '//' . 'my_template' ), $template_ids );
$this->assertSame( array( get_stylesheet() . '//' . 'my_template' ), $template_ids );
// Filter by CPT ID.
$templates = get_block_templates( array( 'wp_id' => self::$post->ID ), 'wp_template' );
$template_ids = get_template_ids( $templates );
$this->assertEquals( array( get_stylesheet() . '//' . 'my_template' ), $template_ids );
$this->assertSame( array( get_stylesheet() . '//' . 'my_template' ), $template_ids );
}
}

8
tests/phpunit/tests/block-template.php
View File

@ -54,7 +54,7 @@ class Block_Template_Test extends WP_UnitTestCase {
'page.php',
);
$resolved_template_path = locate_block_template( $custom_page_template_path, $type, $templates );
$this->assertEquals( $custom_page_template_path, $resolved_template_path );
$this->assertSame( $custom_page_template_path, $resolved_template_path );
}
/**
@ -73,8 +73,8 @@ class Block_Template_Test extends WP_UnitTestCase {
'page.php',
);
$resolved_template_path = locate_block_template( $page_template_path, $type, $templates );
$this->assertEquals( self::$template_canvas_path, $resolved_template_path );
$this->assertEquals( self::$post->post_content, $_wp_current_template_content );
$this->assertSame( self::$template_canvas_path, $resolved_template_path );
$this->assertSame( self::$post->post_content, $_wp_current_template_content );
}
/**
@ -82,6 +82,6 @@ class Block_Template_Test extends WP_UnitTestCase {
*/
function test_template_remains_unchanged_if_templates_array_is_empty() {
$resolved_template_path = locate_block_template( '', 'search', array() );
$this->assertEquals( '', $resolved_template_path );
$this->assertSame( '', $resolved_template_path );
}
}

8
tests/phpunit/tests/bookmark/getBookmark.php
View File

@ -228,8 +228,8 @@ class Tests_Bookmark_GetBookmark extends WP_UnitTestCase {
$actual_bookmark = get_bookmark( ...$args );
/*
* For non-array output type, use assetEquals. Why? The object pulled from cache will have the same
* property values but will be a different object than the expected object.
* For non-array output type, use assertEquals(). Why? The object pulled from the cache
* will have the same property values but will be a different object than the expected object.
*/
if ( is_object( $expected ) ) {
$this->assertEquals( $expected, $actual_bookmark );
@ -286,8 +286,8 @@ class Tests_Bookmark_GetBookmark extends WP_UnitTestCase {
$actual_bookmark = get_bookmark( ...$args );
/*
* For non-array output type, use assetEquals. Why? The object pulled from the database will have the same
* property values but will be a different object than the expected object.
* For non-array output type, use assertEquals(). Why? The object pulled from the database
* will have the same property values but will be a different object than the expected object.
*/
if ( is_object( $expected ) ) {
$this->assertEquals( $expected, $actual_bookmark );

4
tests/phpunit/tests/post.php
View File

@ -1782,7 +1782,7 @@ class Tests_Post extends WP_UnitTestCase {
function test_stick_post_with_duplicate_post_id_does_not_update_option() {
update_option( 'sticky_posts', array( 1, 2, 2 ) );
stick_post( 2 );
$this->assertEquals( array( 1, 2, 2 ), get_option( 'sticky_posts' ) );
$this->assertSameSets( array( 1, 2, 2 ), get_option( 'sticky_posts' ) );
}
/**
@ -1794,6 +1794,6 @@ class Tests_Post extends WP_UnitTestCase {
function test_unstick_post_with_non_sticky_post_id_does_not_update_option() {
update_option( 'sticky_posts', array( 1, 2, 2 ) );
unstick_post( 3 );
$this->assertEquals( array( 1, 2, 2 ), get_option( 'sticky_posts' ) );
$this->assertSameSets( array( 1, 2, 2 ), get_option( 'sticky_posts' ) );
}
}

56
tests/phpunit/tests/rest-api/rest-sidebars-controller.php
View File

@ -132,7 +132,7 @@ class WP_Test_REST_Sidebars_Controller extends WP_Test_REST_Controller_Testcase
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( array(), $data );
$this->assertSame( array(), $data );
}
/**
@ -170,19 +170,19 @@ class WP_Test_REST_Sidebars_Controller extends WP_Test_REST_Controller_Testcase
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$data = $this->remove_links( $data );
$this->assertEquals(
$this->assertSame(
array(
array(
'id' => 'sidebar-1',
'name' => 'Test sidebar',
'description' => '',
'status' => 'active',
'widgets' => array(),
'class' => '',
'before_widget' => '',
'after_widget' => '',
'before_title' => '',
'after_title' => '',
'status' => 'active',
'widgets' => array(),
),
),
$data
@ -219,22 +219,22 @@ class WP_Test_REST_Sidebars_Controller extends WP_Test_REST_Controller_Testcase
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$data = $this->remove_links( $data );
$this->assertEquals(
$this->assertSame(
array(
array(
'id' => 'sidebar-1',
'name' => 'Test sidebar',
'description' => '',
'status' => 'active',
'widgets' => array(
'text-1',
'rss-1',
),
'class' => '',
'before_widget' => '',
'after_widget' => '',
'before_title' => '',
'after_title' => '',
'status' => 'active',
'widgets' => array(
'text-1',
'rss-1',
),
),
),
$data
@ -256,18 +256,18 @@ class WP_Test_REST_Sidebars_Controller extends WP_Test_REST_Controller_Testcase
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$data = $this->remove_links( $data );
$this->assertEquals(
$this->assertSame(
array(
'id' => 'sidebar-1',
'name' => 'Test sidebar',
'description' => '',
'status' => 'active',
'widgets' => array(),
'class' => '',
'before_widget' => '',
'after_widget' => '',
'before_title' => '',
'after_title' => '',
'status' => 'active',
'widgets' => array(),
),
$data
);
@ -358,21 +358,21 @@ class WP_Test_REST_Sidebars_Controller extends WP_Test_REST_Controller_Testcase
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$data = $this->remove_links( $data );
$this->assertEquals(
$this->assertSame(
array(
'id' => 'sidebar-1',
'name' => 'Test sidebar',
'description' => '',
'status' => 'active',
'widgets' => array(
'text-1',
'text-2',
),
'class' => '',
'before_widget' => '',
'after_widget' => '',
'before_title' => '',
'after_title' => '',
'status' => 'active',
'widgets' => array(
'text-1',
'text-2',
),
),
$data
);
@ -501,35 +501,35 @@ class WP_Test_REST_Sidebars_Controller extends WP_Test_REST_Controller_Testcase
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$data = $this->remove_links( $data );
$this->assertEquals(
$this->assertSame(
array(
array(
'id' => 'sidebar-1',
'name' => 'Test sidebar',
'description' => '',
'status' => 'active',
'widgets' => array(
'text-1',
),
'class' => '',
'before_widget' => '',
'after_widget' => '',
'before_title' => '',
'after_title' => '',
'status' => 'active',
'widgets' => array(
'text-1',
),
),
array(
'id' => 'wp_inactive_widgets',
'name' => 'Inactive widgets',
'description' => '',
'status' => 'inactive',
'widgets' => array(
'rss-1',
),
'class' => '',
'before_widget' => '',
'after_widget' => '',
'before_title' => '',
'after_title' => '',
'status' => 'inactive',
'widgets' => array(
'rss-1',
),
),
),
$data

36
tests/phpunit/tests/rest-api/rest-templates-controller.php
View File

@ -80,19 +80,19 @@ class WP_REST_Template_Controller_Test extends WP_Test_REST_Controller_Testcase
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals(
$this->assertSame(
array(
'id' => 'default//my_template',
'theme' => 'default',
'slug' => 'my_template',
'source' => 'custom',
'type' => 'wp_template',
'description' => 'Description of my template.',
'title' => array(
'raw' => 'My Template',
'rendered' => 'My Template',
),
'description' => 'Description of my template.',
'status' => 'publish',
'source' => 'custom',
'type' => 'wp_template',
'wp_id' => self::$post->ID,
'has_theme_file' => false,
),
@ -108,19 +108,19 @@ class WP_REST_Template_Controller_Test extends WP_Test_REST_Controller_Testcase
unset( $data['content'] );
unset( $data['_links'] );
$this->assertEquals(
$this->assertSame(
array(
'id' => 'default//my_template',
'theme' => 'default',
'slug' => 'my_template',
'source' => 'custom',
'type' => 'wp_template',
'description' => 'Description of my template.',
'title' => array(
'raw' => 'My Template',
'rendered' => 'My Template',
),
'description' => 'Description of my template.',
'status' => 'publish',
'source' => 'custom',
'type' => 'wp_template',
'wp_id' => self::$post->ID,
'has_theme_file' => false,
),
@ -134,8 +134,8 @@ class WP_REST_Template_Controller_Test extends WP_Test_REST_Controller_Testcase
$request->set_body_params(
array(
'slug' => 'my_custom_template',
'title' => 'My Template',
'description' => 'Just a description',
'title' => 'My Template',
'content' => 'Content',
)
);
@ -144,22 +144,22 @@ class WP_REST_Template_Controller_Test extends WP_Test_REST_Controller_Testcase
unset( $data['_links'] );
unset( $data['wp_id'] );
$this->assertEquals(
$this->assertSame(
array(
'id' => 'default//my_custom_template',
'theme' => 'default',
'content' => array(
'raw' => 'Content',
),
'slug' => 'my_custom_template',
'source' => 'custom',
'type' => 'wp_template',
'description' => 'Just a description',
'title' => array(
'raw' => 'My Template',
'rendered' => 'My Template',
),
'description' => 'Just a description',
'status' => 'publish',
'source' => 'custom',
'type' => 'wp_template',
'content' => array(
'raw' => 'Content',
),
'has_theme_file' => false,
),
$data
@ -176,8 +176,8 @@ class WP_REST_Template_Controller_Test extends WP_Test_REST_Controller_Testcase
);
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( 'My new Index Title', $data['title']['raw'] );
$this->assertEquals( 'custom', $data['source'] );
$this->assertSame( 'My new Index Title', $data['title']['raw'] );
$this->assertSame( 'custom', $data['source'] );
}
public function test_delete_item() {

10
tests/phpunit/tests/rest-api/rest-widget-types-controller.php
View File

@ -307,7 +307,7 @@ class WP_Test_REST_Widget_Types_Controller extends WP_Test_REST_Controller_Testc
$request = new WP_REST_Request( 'POST', '/wp/v2/widget-types/search/encode' );
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals(
$this->assertSame(
"<p>\n" .
"\t\t\t<label for=\"widget-search--1-title\">Title:</label>\n" .
"\t\t\t<input class=\"widefat\" id=\"widget-search--1-title\" name=\"widget-search[-1][title]\" type=\"text\" value=\"\" />\n" .
@ -343,7 +343,7 @@ class WP_Test_REST_Widget_Types_Controller extends WP_Test_REST_Controller_Testc
$request->set_param( 'number', 8 );
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals(
$this->assertSame(
"<p>\n" .
"\t\t\t<label for=\"widget-search-8-title\">Title:</label>\n" .
"\t\t\t<input class=\"widefat\" id=\"widget-search-8-title\" name=\"widget-search[8][title]\" type=\"text\" value=\"\" />\n" .
@ -385,7 +385,7 @@ class WP_Test_REST_Widget_Types_Controller extends WP_Test_REST_Controller_Testc
);
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals(
$this->assertSame(
"<p>\n" .
"\t\t\t<label for=\"widget-search--1-title\">Title:</label>\n" .
"\t\t\t<input class=\"widefat\" id=\"widget-search--1-title\" name=\"widget-search[-1][title]\" type=\"text\" value=\"Test title\" />\n" .
@ -421,7 +421,7 @@ class WP_Test_REST_Widget_Types_Controller extends WP_Test_REST_Controller_Testc
$request->set_param( 'form_data', 'widget-search[-1][title]=Updated+title' );
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals(
$this->assertSame(
"<p>\n" .
"\t\t\t<label for=\"widget-search--1-title\">Title:</label>\n" .
"\t\t\t<input class=\"widefat\" id=\"widget-search--1-title\" name=\"widget-search[-1][title]\" type=\"text\" value=\"Updated title\" />\n" .
@ -465,7 +465,7 @@ class WP_Test_REST_Widget_Types_Controller extends WP_Test_REST_Controller_Testc
);
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals(
$this->assertSame(
"<p>\n" .
"\t\t\t<label for=\"widget-search--1-title\">Title:</label>\n" .
"\t\t\t<input class=\"widefat\" id=\"widget-search--1-title\" name=\"widget-search[-1][title]\" type=\"text\" value=\"Test title\" />\n" .

104
tests/phpunit/tests/rest-api/rest-widgets-controller.php
View File

@ -211,7 +211,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( array(), $data );
$this->assertSame( array(), $data );
}
/**
@ -276,6 +276,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
array(
array(
'id' => 'block-1',
'id_base' => 'block',
'sidebar' => 'sidebar-1',
'instance' => array(
'encoded' => base64_encode(
@ -296,11 +297,11 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
'content' => $block_content,
),
),
'id_base' => 'block',
'rendered' => '<p>Block test</p>',
),
array(
'id' => 'rss-1',
'id_base' => 'rss',
'sidebar' => 'sidebar-1',
'instance' => array(
'encoded' => base64_encode(
@ -320,14 +321,13 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
)
),
),
'id_base' => 'rss',
'rendered' => '<a class="rsswidget" href="https://wordpress.org/news/feed"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="http://example.org/wp-includes/images/rss.png" alt="RSS" /></a> <a class="rsswidget" href="https://wordpress.org/news">RSS test</a><ul><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/introducing-learn-wordpress/\'>Introducing Learn WordPress</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/simone/\'>WordPress 5.6 “Simone”</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/state-of-the-word-2020/\'>State of the Word 2020</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/the-month-in-wordpress-november-2020/\'>The Month in WordPress: November 2020</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/wordpress-5-6-release-candidate-2/\'>WordPress 5.6 Release Candidate 2</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/wordpress-5-6-release-candidate/\'>WordPress 5.6 Release Candidate</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/wordpress-5-6-beta-4/\'>WordPress 5.6 Beta 4</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/wordpress-5-6-beta-3/\'>WordPress 5.6 Beta 3</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/the-month-in-wordpress-october-2020/\'>The Month in WordPress: October 2020</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/10/wordpress-5-5-3-maintenance-release/\'>WordPress 5.5.3 Maintenance Release</a></li></ul>',
),
array(
'id' => 'testwidget',
'id_base' => 'testwidget',
'sidebar' => 'sidebar-1',
'instance' => null,
'id_base' => 'testwidget',
'rendered' => '<h1>Default id</h1><span>Default text</span>',
),
),
@ -385,6 +385,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
array(
array(
'id' => 'text-1',
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'encoded' => base64_encode(
@ -405,7 +406,6 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
'text' => 'Custom text test',
),
),
'id_base' => 'text',
'rendered' => '<div class="textwidget">Custom text test</div>',
'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
' <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
@ -414,11 +414,11 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
),
array(
'id' => 'testwidget',
'sidebar' => 'sidebar-1',
'instance' => null,
'id_base' => 'testwidget',
'sidebar' => 'sidebar-1',
'rendered' => '<h1>Default id</h1><span>Default text</span>',
'rendered_form' => 'WP test widget form',
'instance' => null,
),
),
$data
@ -450,6 +450,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$this->assertEqualSets(
array(
'id' => 'text-1',
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'encoded' => base64_encode(
@ -470,7 +471,6 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
'text' => 'Custom text test',
),
),
'id_base' => 'text',
'rendered' => '<div class="textwidget">Custom text test</div>',
),
$data
@ -541,6 +541,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request = new WP_REST_Request( 'POST', '/wp/v2/widgets' );
$request->set_body_params(
array(
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'encoded' => base64_encode(
@ -558,13 +559,12 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
)
),
),
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( 'text-2', $data['id'] );
$this->assertEquals( 'sidebar-1', $data['sidebar'] );
$this->assertSame( 'text-2', $data['id'] );
$this->assertSame( 'sidebar-1', $data['sidebar'] );
$this->assertEqualSets(
array(
'text' => 'Updated text test',
@ -589,6 +589,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request = new WP_REST_Request( 'POST', '/wp/v2/widgets' );
$request->set_body_params(
array(
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'encoded' => base64_encode(
@ -600,7 +601,6 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
),
'hash' => 'badhash',
),
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
@ -621,9 +621,9 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request = new WP_REST_Request( 'POST', '/wp/v2/widgets' );
$request->set_body_params(
array(
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(),
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
@ -644,19 +644,19 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request = new WP_REST_Request( 'POST', '/wp/v2/widgets' );
$request->set_body_params(
array(
'id_base' => 'block',
'sidebar' => 'sidebar-1',
'instance' => array(
'raw' => array(
'content' => '<!-- wp:paragraph --><p>Block test</p><!-- /wp:paragraph -->',
),
),
'id_base' => 'block',
)
);
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( 'block-2', $data['id'] );
$this->assertEquals( 'sidebar-1', $data['sidebar'] );
$this->assertSame( 'block-2', $data['id'] );
$this->assertSame( 'sidebar-1', $data['sidebar'] );
$this->assertEqualSets(
array(
'content' => '<!-- wp:paragraph --><p>Block test</p><!-- /wp:paragraph -->',
@ -683,13 +683,13 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request = new WP_REST_Request( 'POST', '/wp/v2/widgets' );
$request->set_body_params(
array(
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'raw' => array(
'title' => 'Updated text test',
),
),
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
@ -712,15 +712,15 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request = new WP_REST_Request( 'POST', '/wp/v2/widgets' );
$request->set_body_params(
array(
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'form_data' => 'widget-text[2][text]=Updated+text+test',
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( 'text-2', $data['id'] );
$this->assertEquals( 'sidebar-1', $data['sidebar'] );
$this->assertSame( 'text-2', $data['id'] );
$this->assertSame( 'sidebar-1', $data['sidebar'] );
$this->assertEqualSets(
array(
'text' => 'Updated text test',
@ -745,17 +745,17 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request = new WP_REST_Request( 'POST', '/wp/v2/widgets' );
$request->set_body_params(
array(
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'raw' => array( 'text' => 'Text 1' ),
),
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( 'text-2', $data['id'] );
$this->assertEquals( 'sidebar-1', $data['sidebar'] );
$this->assertSame( 'text-2', $data['id'] );
$this->assertSame( 'sidebar-1', $data['sidebar'] );
$this->assertEqualSets(
array(
'text' => 'Text 1',
@ -768,17 +768,17 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request = new WP_REST_Request( 'POST', '/wp/v2/widgets' );
$request->set_body_params(
array(
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'raw' => array( 'text' => 'Text 2' ),
),
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( 'text-3', $data['id'] );
$this->assertEquals( 'sidebar-1', $data['sidebar'] );
$this->assertSame( 'text-3', $data['id'] );
$this->assertSame( 'sidebar-1', $data['sidebar'] );
$this->assertEqualSets(
array(
'text' => 'Text 2',
@ -814,19 +814,19 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request = new WP_REST_Request( 'POST', '/wp/v2/widgets' );
$request->set_body_params(
array(
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'raw' => array(
'text' => 'Updated text test',
),
),
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( 'text-2', $data['id'] );
$this->assertEquals( 'sidebar-1', $data['sidebar'] );
$this->assertSame( 'text-2', $data['id'] );
$this->assertSame( 'sidebar-1', $data['sidebar'] );
$this->assertEqualSets(
array(
'text' => 'Updated text test',
@ -860,20 +860,20 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request->set_body_params(
array(
'id' => 'text-1',
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'raw' => array(
'text' => 'Updated text test',
),
),
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( 'text-1', $data['id'] );
$this->assertEquals( 'sidebar-1', $data['sidebar'] );
$this->assertSame( 'text-1', $data['id'] );
$this->assertSame( 'sidebar-1', $data['sidebar'] );
$this->assertEqualSets(
array(
'text' => 'Updated text test',
@ -919,7 +919,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$response = rest_get_server()->dispatch( $request );
$error = $response->as_error();
$this->assertNotWPError( $error, $error ? $error->get_error_message() : '' );
$this->assertEquals( 'sidebar-2', $response->get_data()['sidebar'] );
$this->assertSame( 'sidebar-2', $response->get_data()['sidebar'] );
$sidebar1 = rest_do_request( '/wp/v2/sidebars/sidebar-1' );
$this->assertNotContains( 'text-1', $sidebar1->get_data()['widgets'] );
@ -961,8 +961,8 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$this->assertEquals( 'text-1', $data['id'] );
$this->assertEquals( 'sidebar-1', $data['sidebar'] );
$this->assertSame( 'text-1', $data['id'] );
$this->assertSame( 'sidebar-1', $data['sidebar'] );
$this->assertEqualSets(
array(
'text' => 'Updated text test',
@ -978,12 +978,12 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
*/
public function test_store_html_as_admin() {
if ( is_multisite() ) {
$this->assertEquals(
$this->assertSame(
'<div class="textwidget">alert(1)</div>',
$this->update_text_widget_with_raw_html( '<script>alert(1)</script>' )
);
} else {
$this->assertEquals(
$this->assertSame(
'<div class="textwidget"><script>alert(1)</script></div>',
$this->update_text_widget_with_raw_html( '<script>alert(1)</script>' )
);
@ -996,12 +996,12 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
public function test_store_html_as_superadmin() {
wp_set_current_user( self::$superadmin_id );
if ( is_multisite() ) {
$this->assertEquals(
$this->assertSame(
'<div class="textwidget"><script>alert(1)</script></div>',
$this->update_text_widget_with_raw_html( '<script>alert(1)</script>' )
);
} else {
$this->assertEquals(
$this->assertSame(
'<div class="textwidget"><script>alert(1)</script></div>',
$this->update_text_widget_with_raw_html( '<script>alert(1)</script>' )
);
@ -1028,12 +1028,12 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request->set_body_params(
array(
'id' => 'text-1',
'id_base' => 'text',
'instance' => array(
'raw' => array(
'text' => $html,
),
),
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
@ -1065,14 +1065,14 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$data = $this->remove_links( $data );
$this->assertEquals(
$this->assertSame(
array(
'id' => 'testwidget',
'id_base' => 'testwidget',
'sidebar' => 'sidebar-1',
'instance' => null,
'rendered' => '<h1>My test id</h1><span>My test title</span>',
'rendered_form' => 'WP test widget form',
'id_base' => 'testwidget',
'instance' => null,
),
$data
);
@ -1102,14 +1102,14 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$data = $this->remove_links( $data );
$this->assertEquals(
$this->assertSame(
array(
'id' => 'testwidget',
'id_base' => 'testwidget',
'sidebar' => 'sidebar-1',
'instance' => null,
'rendered' => '<h1>My test id</h1><span>My test title</span>',
'rendered_form' => 'WP test widget form',
'id_base' => 'testwidget',
'instance' => null,
),
$data
);
@ -1158,13 +1158,13 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$request->set_body_params(
array(
'id' => 'text-1',
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'raw' => array(
'text' => 'Updated \\" \\\' text test',
),
),
'id_base' => 'text',
)
);
$response = rest_get_server()->dispatch( $request );
@ -1179,7 +1179,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$data['instance']['raw']
);
$this->assertEquals(
$this->assertSame(
'<div class="textwidget">Updated \\" \\\' text test</div>',
$data['rendered']
);
@ -1210,6 +1210,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$this->assertEqualSets(
array(
'id' => 'text-1',
'id_base' => 'text',
'sidebar' => 'wp_inactive_widgets',
'instance' => array(
'encoded' => base64_encode(
@ -1230,7 +1231,6 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
'text' => 'Custom text test',
),
),
'id_base' => 'text',
'rendered' => '',
'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
' <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
@ -1270,6 +1270,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
'previous' => array(
'id' => 'text-1',
'id_base' => 'text',
'sidebar' => 'sidebar-1',
'instance' => array(
'encoded' => base64_encode(
@ -1290,7 +1291,6 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
'text' => 'Custom text test',
),
),
'id_base' => 'text',
'rendered' => '<div class="textwidget">Custom text test</div>',
'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
' <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
@ -1303,7 +1303,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
);
$response = rest_do_request( '/wp/v2/widgets/text-1' );
$this->assertEquals( 404, $response->get_status() );
$this->assertSame( 404, $response->get_status() );
$this->assertArrayNotHasKey( 'text-1', get_option( 'sidebars_widgets' )['sidebar-1'] );
$this->assertArrayNotHasKey( 1, get_option( 'widget_text' ) );
@ -1379,7 +1379,7 @@ class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
$data = $response->get_data();
$properties = $data['schema']['properties'];
$this->assertEquals( 7, count( $properties ) );
$this->assertSame( 7, count( $properties ) );
$this->assertArrayHasKey( 'id', $properties );
$this->assertArrayHasKey( 'id_base', $properties );
$this->assertArrayHasKey( 'sidebar', $properties );

14
tests/phpunit/tests/theme/wpThemeJson.php
View File

@ -156,15 +156,15 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
)
);
$this->assertEquals(
$this->assertSame(
'body{--wp--preset--color--grey: grey;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}body{color: var(--wp--preset--color--grey);}a{background-color: #333;color: #111;}.wp-block-group{padding-top: 12px;padding-bottom: 24px;}.wp-block-group a{color: #111;}h1,h2,h3,h4,h5,h6{color: #123456;}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a{background-color: #777;color: #555;}.has-grey-color{color: grey !important;}.has-grey-background-color{background-color: grey !important;}',
$theme_json->get_stylesheet()
);
$this->assertEquals(
$this->assertSame(
'body{color: var(--wp--preset--color--grey);}a{background-color: #333;color: #111;}.wp-block-group{padding-top: 12px;padding-bottom: 24px;}.wp-block-group a{color: #111;}h1,h2,h3,h4,h5,h6{color: #123456;}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a{background-color: #777;color: #555;}.has-grey-color{color: grey !important;}.has-grey-background-color{background-color: grey !important;}',
$theme_json->get_stylesheet( 'block_styles' )
);
$this->assertEquals(
$this->assertSame(
'body{--wp--preset--color--grey: grey;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}',
$theme_json->get_stylesheet( 'css_variables' )
);
@ -191,7 +191,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
)
);
$this->assertEquals(
$this->assertSame(
'h1.has-white-color,h2.has-white-color,h3.has-white-color,h4.has-white-color,h5.has-white-color,h6.has-white-color{color: #fff !important;}h1.has-white-background-color,h2.has-white-background-color,h3.has-white-background-color,h4.has-white-background-color,h5.has-white-background-color,h6.has-white-background-color{background-color: #fff !important;}',
$theme_json->get_stylesheet( 'block_styles' )
);
@ -227,11 +227,11 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
)
);
$this->assertEquals(
$this->assertSame(
'.wp-block-group{--wp--preset--color--grey: grey;}.wp-block-group{color: red;}.wp-block-group.has-grey-color{color: grey !important;}.wp-block-group.has-grey-background-color{background-color: grey !important;}',
$theme_json->get_stylesheet()
);
$this->assertEquals(
$this->assertSame(
'.wp-block-group{color: red;}.wp-block-group.has-grey-color{color: grey !important;}.wp-block-group.has-grey-background-color{background-color: grey !important;}',
$theme_json->get_stylesheet( 'block_styles' )
);
@ -268,7 +268,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
)
);
$this->assertEquals(
$this->assertSame(
'body{--wp--preset--color--grey: grey;}p{background-color: blue;color: red;font-size: 12px;line-height: 1.3;}.has-grey-color{color: grey !important;}.has-grey-background-color{background-color: grey !important;}',
$theme_json->get_stylesheet()
);

2
tests/phpunit/tests/theme/wpThemeJsonResolver.php
View File

@ -88,7 +88,7 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase {
),
);
$this->assertEquals( $expected, $actual );
$this->assertSame( $expected, $actual );
}
/**