vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-17 07:30:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: Use the factory method instead of the property.

Browse Source 
This replaces all references to the `WP_UnitTestCase_Base::$factory` property with static function calls to the `WP_UnitTestCase_Base::factory()` method.

This is a consistency improvement for the test suite.

Follow up to [35225], [35242], [49603], [54087], [54088].

Props jrf.
See #55652.

git-svn-id: https://develop.svn.wordpress.org/trunk@54090 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2022-09-06 22:09:49 +00:00
parent 563e24ced1
commit ff56396bf3
52 changed files with 598 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
tests/phpunit/tests/rest-api/rest-users-controller.php
View File

@@ -340,7 +340,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
$this->assertStringContainsString( '<' . $next_link . '>; rel="next"', $headers['Link'] );
// 3rd page.
$this->factory->user->create();
self::factory()->user->create();
$total_users++;
$total_pages++;
$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -432,9 +432,9 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
public function test_get_items_orderby_name() {
wp_set_current_user( self::$user );
$low_id = $this->factory->user->create( array( 'display_name' => 'AAAAA' ) );
$mid_id = $this->factory->user->create( array( 'display_name' => 'NNNNN' ) );
$high_id = $this->factory->user->create( array( 'display_name' => 'ZZZZ' ) );
$low_id = self::factory()->user->create( array( 'display_name' => 'AAAAA' ) );
$mid_id = self::factory()->user->create( array( 'display_name' => 'NNNNN' ) );
$high_id = self::factory()->user->create( array( 'display_name' => 'ZZZZ' ) );
$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
$request->set_param( 'orderby', 'name' );
@@ -456,8 +456,8 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
public function test_get_items_orderby_url() {
wp_set_current_user( self::$user );
$low_id = $this->factory->user->create( array( 'user_url' => 'http://a.com' ) );
$high_id = $this->factory->user->create( array( 'user_url' => 'http://b.com' ) );
$low_id = self::factory()->user->create( array( 'user_url' => 'http://a.com' ) );
$high_id = self::factory()->user->create( array( 'user_url' => 'http://b.com' ) );
$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
$request->set_param( 'orderby', 'url' );
@@ -481,8 +481,8 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
public function test_get_items_orderby_slug() {
wp_set_current_user( self::$user );
$high_id = $this->factory->user->create( array( 'user_nicename' => 'blogin' ) );
$low_id = $this->factory->user->create( array( 'user_nicename' => 'alogin' ) );
$high_id = self::factory()->user->create( array( 'user_nicename' => 'blogin' ) );
$low_id = self::factory()->user->create( array( 'user_nicename' => 'alogin' ) );
$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
$request->set_param( 'orderby', 'slug' );
@@ -506,9 +506,9 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
public function test_get_items_orderby_slugs() {
wp_set_current_user( self::$user );
$this->factory->user->create( array( 'user_nicename' => 'burrito' ) );
$this->factory->user->create( array( 'user_nicename' => 'taco' ) );
$this->factory->user->create( array( 'user_nicename' => 'chalupa' ) );
self::factory()->user->create( array( 'user_nicename' => 'burrito' ) );
self::factory()->user->create( array( 'user_nicename' => 'taco' ) );
self::factory()->user->create( array( 'user_nicename' => 'chalupa' ) );
$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
$request->set_param( 'orderby', 'include_slugs' );
@@ -524,8 +524,8 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
public function test_get_items_orderby_email() {
wp_set_current_user( self::$user );
$high_id = $this->factory->user->create( array( 'user_email' => 'bemail@gmail.com' ) );
$low_id = $this->factory->user->create( array( 'user_email' => 'aemail@gmail.com' ) );
$high_id = self::factory()->user->create( array( 'user_email' => 'bemail@gmail.com' ) );
$low_id = self::factory()->user->create( array( 'user_email' => 'aemail@gmail.com' ) );
$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
$request->set_param( 'orderby', 'email' );
@@ -604,8 +604,8 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
public function test_get_items_include_query() {
wp_set_current_user( self::$user );
$id1 = $this->factory->user->create();
$id2 = $this->factory->user->create();
$id1 = self::factory()->user->create();
$id2 = self::factory()->user->create();
$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -640,8 +640,8 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
public function test_get_items_exclude_query() {
wp_set_current_user( self::$user );
$id1 = $this->factory->user->create();
$id2 = $this->factory->user->create();
$id1 = self::factory()->user->create();
$id2 = self::factory()->user->create();
$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
$request->set_param( 'per_page', self::$per_page ); // There are >10 users at this point.
@@ -672,14 +672,14 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
$response = rest_get_server()->dispatch( $request );
$this->assertCount( 0, $response->get_data() );
$yolo_id = $this->factory->user->create( array( 'display_name' => 'yololololo' ) );
$yolo_id = self::factory()->user->create( array( 'display_name' => 'yololololo' ) );
$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
$request->set_param( 'search', 'yololololo' );
$response = rest_get_server()->dispatch( $request );
$this->assertCount( 1, $response->get_data() );
// Default to wildcard search.
$adam_id = $this->factory->user->create(
$adam_id = self::factory()->user->create(
array(
'role' => 'author',
'user_nicename' => 'adam',
@@ -697,13 +697,13 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
public function test_get_items_slug_query() {
wp_set_current_user( self::$user );
$this->factory->user->create(
self::factory()->user->create(
array(
'display_name' => 'foo',
'user_login' => 'bar',
)
);
$id2 = $this->factory->user->create(
$id2 = self::factory()->user->create(
array(
'display_name' => 'Moo',
'user_login' => 'foo',
@@ -721,25 +721,25 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
public function test_get_items_slug_array_query() {
wp_set_current_user( self::$user );
$id1 = $this->factory->user->create(
$id1 = self::factory()->user->create(
array(
'display_name' => 'Taco',
'user_login' => 'taco',
)
);
$id2 = $this->factory->user->create(
$id2 = self::factory()->user->create(
array(
'display_name' => 'Enchilada',
'user_login' => 'enchilada',
)
);
$id3 = $this->factory->user->create(
$id3 = self::factory()->user->create(
array(
'display_name' => 'Burrito',
'user_login' => 'burrito',
)
);
$this->factory->user->create(
self::factory()->user->create(
array(
'display_name' => 'Hon Pizza',
'user_login' => 'pizza',
@@ -767,25 +767,25 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
public function test_get_items_slug_csv_query() {
wp_set_current_user( self::$user );
$id1 = $this->factory->user->create(
$id1 = self::factory()->user->create(
array(
'display_name' => 'Taco',
'user_login' => 'taco',
)
);
$id2 = $this->factory->user->create(
$id2 = self::factory()->user->create(
array(
'display_name' => 'Enchilada',
'user_login' => 'enchilada',
)
);
$id3 = $this->factory->user->create(
$id3 = self::factory()->user->create(
array(
'display_name' => 'Burrito',
'user_login' => 'burrito',
)
);
$this->factory->user->create(
self::factory()->user->create(
array(
'display_name' => 'Hon Pizza',
'user_login' => 'pizza',
@@ -962,7 +962,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_get_item() {
$user_id = $this->factory->user->create();
$user_id = self::factory()->user->create();
wp_set_current_user( self::$user );
@@ -1029,7 +1029,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
$this->allow_user_to_manage_multisite();
$lolz = $this->factory->user->create(
$lolz = self::factory()->user->create(
array(
'display_name' => 'lolz',
'roles' => '',
@@ -1114,13 +1114,13 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_get_item_published_author_post() {
$author_id = $this->factory->user->create(
$author_id = self::factory()->user->create(
array(
'role' => 'author',
)
);
$post_id = $this->factory->post->create(
$post_id = self::factory()->post->create(
array(
'post_author' => $author_id,
)
@@ -1134,7 +1134,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_get_item_published_author_pages() {
$author_id = $this->factory->user->create(
$author_id = self::factory()->user->create(
array(
'role' => 'author',
)
@@ -1146,7 +1146,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
$response = rest_get_server()->dispatch( $request );
$this->assertSame( 401, $response->get_status() );
$post_id = $this->factory->post->create(
$post_id = self::factory()->post->create(
array(
'post_author' => $author_id,
'post_type' => 'page',
@@ -1158,7 +1158,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_get_user_with_edit_context() {
$user_id = $this->factory->user->create();
$user_id = self::factory()->user->create();
$this->allow_user_to_manage_multisite();
@@ -1169,13 +1169,13 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_get_item_published_author_wrong_context() {
$author_id = $this->factory->user->create(
$author_id = self::factory()->user->create(
array(
'role' => 'author',
)
);
$post_id = $this->factory->post->create(
$post_id = self::factory()->post->create(
array(
'post_author' => $author_id,
)
@@ -1554,7 +1554,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_update_item() {
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'user_email' => 'test@example.com',
'user_pass' => 'sjflsfls',
@@ -1620,13 +1620,13 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_update_item_existing_email() {
$user1 = $this->factory->user->create(
$user1 = self::factory()->user->create(
array(
'user_login' => 'test_json_user',
'user_email' => 'testjson@example.com',
)
);
$user2 = $this->factory->user->create(
$user2 = self::factory()->user->create(
array(
'user_login' => 'test_json_user2',
'user_email' => 'testjson2@example.com',
@@ -1684,7 +1684,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_update_item_invalid_locale() {
$user1 = $this->factory->user->create(
$user1 = self::factory()->user->create(
array(
'user_login' => 'test_json_user',
'user_email' => 'testjson@example.com',
@@ -1703,7 +1703,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_update_item_en_US_locale() {
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'user_login' => 'test_json_user',
'user_email' => 'testjson@example.com',
@@ -1727,7 +1727,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @ticket 38632
*/
public function test_update_item_empty_locale() {
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'user_login' => 'test_json_user',
'user_email' => 'testjson@example.com',
@@ -1751,13 +1751,13 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_update_item_username_attempt() {
$user1 = $this->factory->user->create(
$user1 = self::factory()->user->create(
array(
'user_login' => 'test_json_user',
'user_email' => 'testjson@example.com',
)
);
$user2 = $this->factory->user->create(
$user2 = self::factory()->user->create(
array(
'user_login' => 'test_json_user2',
'user_email' => 'testjson2@example.com',
@@ -1776,13 +1776,13 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_update_item_existing_nicename() {
$user1 = $this->factory->user->create(
$user1 = self::factory()->user->create(
array(
'user_login' => 'test_json_user',
'user_email' => 'testjson@example.com',
)
);
$user2 = $this->factory->user->create(
$user2 = self::factory()->user->create(
array(
'user_login' => 'test_json_user2',
'user_email' => 'testjson2@example.com',
@@ -1801,7 +1801,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_json_update_user() {
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'user_email' => 'testjson2@example.com',
'user_pass' => 'sjflsfl3sdjls',
@@ -1846,7 +1846,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_update_user_role() {
$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
$user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
wp_set_current_user( self::$user );
@@ -1867,7 +1867,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_update_user_multiple_roles() {
$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
$user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
wp_set_current_user( self::$user );
@@ -1913,7 +1913,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-excluded
*/
public function test_update_user_role_invalid_privilege_deescalation() {
$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
$user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
wp_set_current_user( $user_id );
@@ -1942,7 +1942,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_update_user_role_privilege_deescalation_multisite() {
$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
$user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
wp_set_current_user( $user_id );
$user = wp_get_current_user();
@@ -1956,7 +1956,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
$this->assertSame( 'editor', $new_data['roles'][0] );
$this->assertNotEquals( 'administrator', $new_data['roles'][0] );
$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
$user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
wp_set_current_user( $user_id );
$user = wp_get_current_user();
@@ -2046,7 +2046,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @ticket 40263
*/
public function test_update_item_only_roles_as_editor() {
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'author',
)
@@ -2064,7 +2064,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @ticket 40263
*/
public function test_update_item_only_roles_as_site_administrator() {
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'author',
)
@@ -2085,7 +2085,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @ticket 40263
*/
public function test_update_item_including_roles_and_other_params() {
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'author',
)
@@ -2341,7 +2341,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_item() {
$user_id = $this->factory->user->create( array( 'display_name' => 'Deleted User' ) );
$user_id = self::factory()->user->create( array( 'display_name' => 'Deleted User' ) );
$this->allow_user_to_manage_multisite();
@@ -2366,7 +2366,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_item_no_trash() {
$user_id = $this->factory->user->create( array( 'display_name' => 'Deleted User' ) );
$user_id = self::factory()->user->create( array( 'display_name' => 'Deleted User' ) );
$this->allow_user_to_manage_multisite();
@@ -2396,7 +2396,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_current_item() {
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'administrator',
'display_name' => 'Deleted User',
@@ -2425,7 +2425,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_current_item_no_trash() {
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'administrator',
'display_name' => 'Deleted User',
@@ -2458,7 +2458,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_user_without_permission() {
$user_id = $this->factory->user->create();
$user_id = self::factory()->user->create();
$this->allow_user_to_manage_multisite();
@@ -2496,9 +2496,9 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
$this->allow_user_to_manage_multisite();
// Test with a new user, to avoid any complications.
$user_id = $this->factory->user->create();
$reassign_id = $this->factory->user->create();
$test_post = $this->factory->post->create(
$user_id = self::factory()->user->create();
$reassign_id = self::factory()->user->create();
$test_post = self::factory()->post->create(
array(
'post_author' => $user_id,
)
@@ -2530,7 +2530,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_user_invalid_reassign_id() {
$user_id = $this->factory->user->create();
$user_id = self::factory()->user->create();
$this->allow_user_to_manage_multisite();
@@ -2551,7 +2551,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_user_invalid_reassign_passed_as_string() {
$user_id = $this->factory->user->create();
$user_id = self::factory()->user->create();
$this->allow_user_to_manage_multisite();
@@ -2566,13 +2566,13 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_user_reassign_passed_as_boolean_false_trashes_post() {
$user_id = $this->factory->user->create();
$user_id = self::factory()->user->create();
$this->allow_user_to_manage_multisite();
wp_set_current_user( self::$user );
$test_post = $this->factory->post->create(
$test_post = self::factory()->post->create(
array(
'post_author' => $user_id,
)
@@ -2594,13 +2594,13 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_user_reassign_passed_as_string_false_trashes_post() {
$user_id = $this->factory->user->create();
$user_id = self::factory()->user->create();
$this->allow_user_to_manage_multisite();
wp_set_current_user( self::$user );
$test_post = $this->factory->post->create(
$test_post = self::factory()->post->create(
array(
'post_author' => $user_id,
)
@@ -2622,13 +2622,13 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_user_reassign_passed_as_empty_string_trashes_post() {
$user_id = $this->factory->user->create();
$user_id = self::factory()->user->create();
$this->allow_user_to_manage_multisite();
wp_set_current_user( self::$user );
$test_post = $this->factory->post->create(
$test_post = self::factory()->post->create(
array(
'post_author' => $user_id,
)
@@ -2650,13 +2650,13 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
}
public function test_delete_user_reassign_passed_as_0_reassigns_author() {
$user_id = $this->factory->user->create();
$user_id = self::factory()->user->create();
$this->allow_user_to_manage_multisite();
wp_set_current_user( self::$user );
$test_post = $this->factory->post->create(
$test_post = self::factory()->post->create(
array(
'post_author' => $user_id,
)
@@ -2831,7 +2831,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
*/
public function test_get_item_from_different_site_as_site_administrator() {
switch_to_blog( self::$site );
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'author',
)
@@ -2851,7 +2851,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
*/
public function test_get_item_from_different_site_as_network_administrator() {
switch_to_blog( self::$site );
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'author',
)
@@ -2871,7 +2871,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
*/
public function test_update_item_from_different_site_as_site_administrator() {
switch_to_blog( self::$site );
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'author',
)
@@ -2893,7 +2893,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
*/
public function test_update_item_from_different_site_as_network_administrator() {
switch_to_blog( self::$site );
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'author',
)
@@ -2915,7 +2915,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
*/
public function test_delete_item_from_different_site_as_site_administrator() {
switch_to_blog( self::$site );
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'author',
)
@@ -2937,7 +2937,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
*/
public function test_delete_item_from_different_site_as_network_administrator() {
switch_to_blog( self::$site );
$user_id = $this->factory->user->create(
$user_id = self::factory()->user->create(
array(
'role' => 'author',
)