Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/rest-api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ function create_initial_rest_routes() {
$font_collections_controller->register_routes();

// Abilities.
$abilities_categories_controller = new WP_REST_Abilities_V1_Categories_Controller();
$abilities_categories_controller = new WP_REST_Abilities_V1_Abilities_Categories_Controller();
$abilities_categories_controller->register_routes();
$abilities_run_controller = new WP_REST_Abilities_V1_Run_Controller();
$abilities_run_controller->register_routes();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
*
* @see WP_REST_Controller
*/
class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
class WP_REST_Abilities_V1_Abilities_Categories_Controller extends WP_REST_Controller {

/**
* REST API namespace.
Expand All@@ -32,7 +32,7 @@ class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
* @since 6.9.0
* @var string
*/
protected $rest_base = 'categories';
protected $rest_base = 'abilities-categories';

/**
* Registers the routes for ability categories.
Expand DownExpand Up@@ -212,7 +212,7 @@ public function prepare_item_for_response( $category, $request ) {
'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
),
'abilities' => array(
'href' => rest_url( sprintf( '%s/abilities?category=%s', $this->namespace, $category->get_slug() ) ),
'href' => rest_url( sprintf( '%s/abilities?ability_category=%s', $this->namespace, $category->get_slug() ) ),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this parameter already get changed in another PR? I'm not seeing this change in this PR.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay as category param here, unless you also want to change the filtering in the list controller.

),
);

Expand Down
2 changes: 1 addition & 1 deletion src/wp-settings.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,7 +336,7 @@
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-families-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-faces-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-collections-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-abilities-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-run-controller.php';
require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php';
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/tests/rest-api/rest-schema-setup.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,8 +196,8 @@ public function test_expected_routes_in_schema() {
'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)',
'/wp/v2/font-families/(?P<id>[\d]+)',
'/wp-abilities/v1',
'/wp-abilities/v1/categories',
'/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities-categories',
'/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+?)/run',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+)',
'/wp-abilities/v1/abilities',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
*
* @group abilities-api
* @group rest-api
* @group abilities-categories
*/
class Tests_REST_API_WpRestAbilitiesV1CategoriesController extends WP_UnitTestCase {
class Tests_REST_API_WpRestAbilitiesV1AblitiesCategoriesController extends WP_UnitTestCase {

/**
* REST Server instance.
Expand DownExpand Up@@ -142,7 +143,7 @@ public function register_test_ability_categories(): void {
* @ticket 64098
*/
public function test_get_items(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -165,7 +166,7 @@ public function test_get_items(): void {
* @ticket 64098
*/
public function test_get_item(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -183,7 +184,7 @@ public function test_get_item(): void {
* @ticket 64098
*/
public function test_get_item_with_meta(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-communication' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-communication' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -201,7 +202,7 @@ public function test_get_item_with_meta(): void {
* @ticket 64098
*/
public function test_get_item_with_selected_fields(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( '_fields', 'slug,label' );
$response = $this->server->dispatch( $request );
add_filter( 'rest_post_dispatch', 'rest_filter_response_fields', 10, 3 );
Expand All@@ -224,7 +225,7 @@ public function test_get_item_with_selected_fields(): void {
* @expectedIncorrectUsage WP_Ability_Categories_Registry::get_registered
*/
public function test_get_item_not_found(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/non-existent' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/non-existent' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 404, $response->get_status() );
Expand All@@ -241,7 +242,7 @@ public function test_get_item_not_found(): void {
public function test_get_items_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -255,7 +256,7 @@ public function test_get_items_permission_denied(): void {
public function test_get_item_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -267,7 +268,7 @@ public function test_get_item_permission_denied(): void {
* @ticket 64098
*/
public function test_pagination_headers(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$response = $this->server->dispatch( $request );

Expand All@@ -288,7 +289,7 @@ public function test_pagination_headers(): void {
* @ticket 64098
*/
public function test_head_request(): void {
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$data = $response->get_data();
Expand All@@ -305,7 +306,7 @@ public function test_head_request(): void {
* @ticket 64098
*/
public function test_pagination_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$request->set_param( 'page', 1 );
$response = $this->server->dispatch( $request );
Expand DownExpand Up@@ -343,7 +344,7 @@ public function test_pagination_links(): void {
* @ticket 64098
*/
public function test_collection_params(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 5 );
$response = $this->server->dispatch( $request );

Expand All@@ -356,7 +357,7 @@ public function test_collection_params(): void {
$data = $response->get_data();
$this->assertCount( 5, $data );

$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$page1_request->set_param( 'per_page', 5 );
$page1_request->set_param( 'page', 1 );
$page1_response = $this->server->dispatch( $page1_request );
Expand All@@ -372,7 +373,7 @@ public function test_collection_params(): void {
* @ticket 64098
*/
public function test_ability_category_response_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$links = $response->get_links();
Expand All@@ -381,13 +382,13 @@ public function test_ability_category_response_links(): void {
$this->assertArrayHasKey( 'abilities', $links );

$self_link = $links['self'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories/test-data-retrieval', $self_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories/test-data-retrieval', $self_link );

$collection_link = $links['collection'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories', $collection_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories', $collection_link );

$abilities_link = $links['abilities'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/abilities?category=test-data-retrieval', $abilities_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities?ability_category=test-data-retrieval', $abilities_link );
}

/**
Expand All@@ -396,7 +397,7 @@ public function test_ability_category_response_links(): void {
* @ticket 64098
*/
public function test_context_parameter(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( 'context', 'view' );
$response = $this->server->dispatch( $request );

Expand All@@ -417,7 +418,7 @@ public function test_context_parameter(): void {
* @ticket 64098
*/
public function test_get_schema(): void {
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );
$data = $response->get_data();

Expand DownExpand Up@@ -448,7 +449,7 @@ public function test_get_schema(): void {
* @ticket 64098
*/
public function test_ability_category_slug_with_valid_format(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );
$this->assertEquals( 200, $response->get_status() );
}
Expand DownExpand Up@@ -479,7 +480,7 @@ public function data_invalid_ability_category_slugs_provider(): array {
* @param string $slug Invalid ability category slug to test.
*/
public function test_ability_category_slug_with_invalid_format( string $slug ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/' . $slug );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/' . $slug );
$response = $this->server->dispatch( $request );

$this->assertContains( $response->get_status(), array( 400, 404 ) );
Expand DownExpand Up@@ -512,7 +513,7 @@ public function data_invalid_pagination_params_provider(): array {
* @param array<string, mixed> $params Invalid pagination parameters.
*/
public function test_invalid_pagination_parameters( array $params ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_query_params( $params );

$response = $this->server->dispatch( $request );
Expand Down
6 changes: 3 additions & 3 deletions tests/qunit/fixtures/wp-api-generated.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12423,7 +12423,7 @@ mockedApiResponse.Schema = {
]
}
},
"/wp-abilities/v1/categories": {
"/wp-abilities/v1/abilities-categories": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand DownExpand Up@@ -12466,12 +12466,12 @@ mockedApiResponse.Schema = {
"_links": {
"self": [
{
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/categories"
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/abilities-categories"
}
]
}
},
"/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/rest-api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ function create_initial_rest_routes() {
$font_collections_controller->register_routes();

// Abilities.
$abilities_categories_controller = new WP_REST_Abilities_V1_Categories_Controller();
$abilities_categories_controller = new WP_REST_Abilities_V1_Abilities_Categories_Controller();
$abilities_categories_controller->register_routes();
$abilities_run_controller = new WP_REST_Abilities_V1_Run_Controller();
$abilities_run_controller->register_routes();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
*
* @see WP_REST_Controller
*/
class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
class WP_REST_Abilities_V1_Abilities_Categories_Controller extends WP_REST_Controller {

/**
* REST API namespace.
Expand All@@ -32,7 +32,7 @@ class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
* @since 6.9.0
* @var string
*/
protected $rest_base = 'categories';
protected $rest_base = 'abilities-categories';

/**
* Registers the routes for ability categories.
Expand DownExpand Up@@ -212,7 +212,7 @@ public function prepare_item_for_response( $category, $request ) {
'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
),
'abilities' => array(
'href' => rest_url( sprintf( '%s/abilities?category=%s', $this->namespace, $category->get_slug() ) ),
'href' => rest_url( sprintf( '%s/abilities?ability_category=%s', $this->namespace, $category->get_slug() ) ),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this parameter already get changed in another PR? I'm not seeing this change in this PR.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay as category param here, unless you also want to change the filtering in the list controller.

),
);

Expand Down
2 changes: 1 addition & 1 deletion src/wp-settings.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,7 +336,7 @@
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-families-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-faces-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-collections-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-abilities-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-run-controller.php';
require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php';
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/tests/rest-api/rest-schema-setup.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,8 +196,8 @@ public function test_expected_routes_in_schema() {
'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)',
'/wp/v2/font-families/(?P<id>[\d]+)',
'/wp-abilities/v1',
'/wp-abilities/v1/categories',
'/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities-categories',
'/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+?)/run',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+)',
'/wp-abilities/v1/abilities',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
*
* @group abilities-api
* @group rest-api
* @group abilities-categories
*/
class Tests_REST_API_WpRestAbilitiesV1CategoriesController extends WP_UnitTestCase {
class Tests_REST_API_WpRestAbilitiesV1AblitiesCategoriesController extends WP_UnitTestCase {

/**
* REST Server instance.
Expand DownExpand Up@@ -142,7 +143,7 @@ public function register_test_ability_categories(): void {
* @ticket 64098
*/
public function test_get_items(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -165,7 +166,7 @@ public function test_get_items(): void {
* @ticket 64098
*/
public function test_get_item(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -183,7 +184,7 @@ public function test_get_item(): void {
* @ticket 64098
*/
public function test_get_item_with_meta(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-communication' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-communication' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -201,7 +202,7 @@ public function test_get_item_with_meta(): void {
* @ticket 64098
*/
public function test_get_item_with_selected_fields(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( '_fields', 'slug,label' );
$response = $this->server->dispatch( $request );
add_filter( 'rest_post_dispatch', 'rest_filter_response_fields', 10, 3 );
Expand All@@ -224,7 +225,7 @@ public function test_get_item_with_selected_fields(): void {
* @expectedIncorrectUsage WP_Ability_Categories_Registry::get_registered
*/
public function test_get_item_not_found(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/non-existent' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/non-existent' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 404, $response->get_status() );
Expand All@@ -241,7 +242,7 @@ public function test_get_item_not_found(): void {
public function test_get_items_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -255,7 +256,7 @@ public function test_get_items_permission_denied(): void {
public function test_get_item_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -267,7 +268,7 @@ public function test_get_item_permission_denied(): void {
* @ticket 64098
*/
public function test_pagination_headers(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$response = $this->server->dispatch( $request );

Expand All@@ -288,7 +289,7 @@ public function test_pagination_headers(): void {
* @ticket 64098
*/
public function test_head_request(): void {
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$data = $response->get_data();
Expand All@@ -305,7 +306,7 @@ public function test_head_request(): void {
* @ticket 64098
*/
public function test_pagination_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$request->set_param( 'page', 1 );
$response = $this->server->dispatch( $request );
Expand DownExpand Up@@ -343,7 +344,7 @@ public function test_pagination_links(): void {
* @ticket 64098
*/
public function test_collection_params(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 5 );
$response = $this->server->dispatch( $request );

Expand All@@ -356,7 +357,7 @@ public function test_collection_params(): void {
$data = $response->get_data();
$this->assertCount( 5, $data );

$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$page1_request->set_param( 'per_page', 5 );
$page1_request->set_param( 'page', 1 );
$page1_response = $this->server->dispatch( $page1_request );
Expand All@@ -372,7 +373,7 @@ public function test_collection_params(): void {
* @ticket 64098
*/
public function test_ability_category_response_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$links = $response->get_links();
Expand All@@ -381,13 +382,13 @@ public function test_ability_category_response_links(): void {
$this->assertArrayHasKey( 'abilities', $links );

$self_link = $links['self'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories/test-data-retrieval', $self_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories/test-data-retrieval', $self_link );

$collection_link = $links['collection'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories', $collection_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories', $collection_link );

$abilities_link = $links['abilities'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/abilities?category=test-data-retrieval', $abilities_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities?ability_category=test-data-retrieval', $abilities_link );
}

/**
Expand All@@ -396,7 +397,7 @@ public function test_ability_category_response_links(): void {
* @ticket 64098
*/
public function test_context_parameter(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( 'context', 'view' );
$response = $this->server->dispatch( $request );

Expand All@@ -417,7 +418,7 @@ public function test_context_parameter(): void {
* @ticket 64098
*/
public function test_get_schema(): void {
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );
$data = $response->get_data();

Expand DownExpand Up@@ -448,7 +449,7 @@ public function test_get_schema(): void {
* @ticket 64098
*/
public function test_ability_category_slug_with_valid_format(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );
$this->assertEquals( 200, $response->get_status() );
}
Expand DownExpand Up@@ -479,7 +480,7 @@ public function data_invalid_ability_category_slugs_provider(): array {
* @param string $slug Invalid ability category slug to test.
*/
public function test_ability_category_slug_with_invalid_format( string $slug ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/' . $slug );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/' . $slug );
$response = $this->server->dispatch( $request );

$this->assertContains( $response->get_status(), array( 400, 404 ) );
Expand DownExpand Up@@ -512,7 +513,7 @@ public function data_invalid_pagination_params_provider(): array {
* @param array<string, mixed> $params Invalid pagination parameters.
*/
public function test_invalid_pagination_parameters( array $params ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_query_params( $params );

$response = $this->server->dispatch( $request );
Expand Down
6 changes: 3 additions & 3 deletions tests/qunit/fixtures/wp-api-generated.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12423,7 +12423,7 @@ mockedApiResponse.Schema = {
]
}
},
"/wp-abilities/v1/categories": {
"/wp-abilities/v1/abilities-categories": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand DownExpand Up@@ -12466,12 +12466,12 @@ mockedApiResponse.Schema = {
"_links": {
"self": [
{
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/categories"
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/abilities-categories"
}
]
}
},
"/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/rest-api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ function create_initial_rest_routes() {
$font_collections_controller->register_routes();

// Abilities.
$abilities_categories_controller = new WP_REST_Abilities_V1_Categories_Controller();
$abilities_categories_controller = new WP_REST_Abilities_V1_Abilities_Categories_Controller();
$abilities_categories_controller->register_routes();
$abilities_run_controller = new WP_REST_Abilities_V1_Run_Controller();
$abilities_run_controller->register_routes();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
*
* @see WP_REST_Controller
*/
class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
class WP_REST_Abilities_V1_Abilities_Categories_Controller extends WP_REST_Controller {

/**
* REST API namespace.
Expand All@@ -32,7 +32,7 @@ class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
* @since 6.9.0
* @var string
*/
protected $rest_base = 'categories';
protected $rest_base = 'abilities-categories';

/**
* Registers the routes for ability categories.
Expand DownExpand Up@@ -212,7 +212,7 @@ public function prepare_item_for_response( $category, $request ) {
'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
),
'abilities' => array(
'href' => rest_url( sprintf( '%s/abilities?category=%s', $this->namespace, $category->get_slug() ) ),
'href' => rest_url( sprintf( '%s/abilities?ability_category=%s', $this->namespace, $category->get_slug() ) ),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this parameter already get changed in another PR? I'm not seeing this change in this PR.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay as category param here, unless you also want to change the filtering in the list controller.

),
);

Expand Down
2 changes: 1 addition & 1 deletion src/wp-settings.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,7 +336,7 @@
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-families-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-faces-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-collections-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-abilities-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-run-controller.php';
require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php';
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/tests/rest-api/rest-schema-setup.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,8 +196,8 @@ public function test_expected_routes_in_schema() {
'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)',
'/wp/v2/font-families/(?P<id>[\d]+)',
'/wp-abilities/v1',
'/wp-abilities/v1/categories',
'/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities-categories',
'/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+?)/run',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+)',
'/wp-abilities/v1/abilities',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
*
* @group abilities-api
* @group rest-api
* @group abilities-categories
*/
class Tests_REST_API_WpRestAbilitiesV1CategoriesController extends WP_UnitTestCase {
class Tests_REST_API_WpRestAbilitiesV1AblitiesCategoriesController extends WP_UnitTestCase {

/**
* REST Server instance.
Expand DownExpand Up@@ -142,7 +143,7 @@ public function register_test_ability_categories(): void {
* @ticket 64098
*/
public function test_get_items(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -165,7 +166,7 @@ public function test_get_items(): void {
* @ticket 64098
*/
public function test_get_item(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -183,7 +184,7 @@ public function test_get_item(): void {
* @ticket 64098
*/
public function test_get_item_with_meta(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-communication' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-communication' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -201,7 +202,7 @@ public function test_get_item_with_meta(): void {
* @ticket 64098
*/
public function test_get_item_with_selected_fields(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( '_fields', 'slug,label' );
$response = $this->server->dispatch( $request );
add_filter( 'rest_post_dispatch', 'rest_filter_response_fields', 10, 3 );
Expand All@@ -224,7 +225,7 @@ public function test_get_item_with_selected_fields(): void {
* @expectedIncorrectUsage WP_Ability_Categories_Registry::get_registered
*/
public function test_get_item_not_found(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/non-existent' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/non-existent' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 404, $response->get_status() );
Expand All@@ -241,7 +242,7 @@ public function test_get_item_not_found(): void {
public function test_get_items_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -255,7 +256,7 @@ public function test_get_items_permission_denied(): void {
public function test_get_item_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -267,7 +268,7 @@ public function test_get_item_permission_denied(): void {
* @ticket 64098
*/
public function test_pagination_headers(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$response = $this->server->dispatch( $request );

Expand All@@ -288,7 +289,7 @@ public function test_pagination_headers(): void {
* @ticket 64098
*/
public function test_head_request(): void {
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$data = $response->get_data();
Expand All@@ -305,7 +306,7 @@ public function test_head_request(): void {
* @ticket 64098
*/
public function test_pagination_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$request->set_param( 'page', 1 );
$response = $this->server->dispatch( $request );
Expand DownExpand Up@@ -343,7 +344,7 @@ public function test_pagination_links(): void {
* @ticket 64098
*/
public function test_collection_params(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 5 );
$response = $this->server->dispatch( $request );

Expand All@@ -356,7 +357,7 @@ public function test_collection_params(): void {
$data = $response->get_data();
$this->assertCount( 5, $data );

$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$page1_request->set_param( 'per_page', 5 );
$page1_request->set_param( 'page', 1 );
$page1_response = $this->server->dispatch( $page1_request );
Expand All@@ -372,7 +373,7 @@ public function test_collection_params(): void {
* @ticket 64098
*/
public function test_ability_category_response_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$links = $response->get_links();
Expand All@@ -381,13 +382,13 @@ public function test_ability_category_response_links(): void {
$this->assertArrayHasKey( 'abilities', $links );

$self_link = $links['self'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories/test-data-retrieval', $self_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories/test-data-retrieval', $self_link );

$collection_link = $links['collection'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories', $collection_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories', $collection_link );

$abilities_link = $links['abilities'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/abilities?category=test-data-retrieval', $abilities_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities?ability_category=test-data-retrieval', $abilities_link );
}

/**
Expand All@@ -396,7 +397,7 @@ public function test_ability_category_response_links(): void {
* @ticket 64098
*/
public function test_context_parameter(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( 'context', 'view' );
$response = $this->server->dispatch( $request );

Expand All@@ -417,7 +418,7 @@ public function test_context_parameter(): void {
* @ticket 64098
*/
public function test_get_schema(): void {
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );
$data = $response->get_data();

Expand DownExpand Up@@ -448,7 +449,7 @@ public function test_get_schema(): void {
* @ticket 64098
*/
public function test_ability_category_slug_with_valid_format(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );
$this->assertEquals( 200, $response->get_status() );
}
Expand DownExpand Up@@ -479,7 +480,7 @@ public function data_invalid_ability_category_slugs_provider(): array {
* @param string $slug Invalid ability category slug to test.
*/
public function test_ability_category_slug_with_invalid_format( string $slug ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/' . $slug );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/' . $slug );
$response = $this->server->dispatch( $request );

$this->assertContains( $response->get_status(), array( 400, 404 ) );
Expand DownExpand Up@@ -512,7 +513,7 @@ public function data_invalid_pagination_params_provider(): array {
* @param array<string, mixed> $params Invalid pagination parameters.
*/
public function test_invalid_pagination_parameters( array $params ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_query_params( $params );

$response = $this->server->dispatch( $request );
Expand Down
6 changes: 3 additions & 3 deletions tests/qunit/fixtures/wp-api-generated.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12423,7 +12423,7 @@ mockedApiResponse.Schema = {
]
}
},
"/wp-abilities/v1/categories": {
"/wp-abilities/v1/abilities-categories": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand DownExpand Up@@ -12466,12 +12466,12 @@ mockedApiResponse.Schema = {
"_links": {
"self": [
{
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/categories"
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/abilities-categories"
}
]
}
},
"/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/rest-api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ function create_initial_rest_routes() {
$font_collections_controller->register_routes();

// Abilities.
$abilities_categories_controller = new WP_REST_Abilities_V1_Categories_Controller();
$abilities_categories_controller = new WP_REST_Abilities_V1_Abilities_Categories_Controller();
$abilities_categories_controller->register_routes();
$abilities_run_controller = new WP_REST_Abilities_V1_Run_Controller();
$abilities_run_controller->register_routes();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
*
* @see WP_REST_Controller
*/
class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
class WP_REST_Abilities_V1_Abilities_Categories_Controller extends WP_REST_Controller {

/**
* REST API namespace.
Expand All@@ -32,7 +32,7 @@ class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
* @since 6.9.0
* @var string
*/
protected $rest_base = 'categories';
protected $rest_base = 'abilities-categories';

/**
* Registers the routes for ability categories.
Expand DownExpand Up@@ -212,7 +212,7 @@ public function prepare_item_for_response( $category, $request ) {
'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
),
'abilities' => array(
'href' => rest_url( sprintf( '%s/abilities?category=%s', $this->namespace, $category->get_slug() ) ),
'href' => rest_url( sprintf( '%s/abilities?ability_category=%s', $this->namespace, $category->get_slug() ) ),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this parameter already get changed in another PR? I'm not seeing this change in this PR.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay as category param here, unless you also want to change the filtering in the list controller.

),
);

Expand Down
2 changes: 1 addition & 1 deletion src/wp-settings.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,7 +336,7 @@
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-families-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-faces-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-collections-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-abilities-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-run-controller.php';
require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php';
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/tests/rest-api/rest-schema-setup.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,8 +196,8 @@ public function test_expected_routes_in_schema() {
'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)',
'/wp/v2/font-families/(?P<id>[\d]+)',
'/wp-abilities/v1',
'/wp-abilities/v1/categories',
'/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities-categories',
'/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+?)/run',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+)',
'/wp-abilities/v1/abilities',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
*
* @group abilities-api
* @group rest-api
* @group abilities-categories
*/
class Tests_REST_API_WpRestAbilitiesV1CategoriesController extends WP_UnitTestCase {
class Tests_REST_API_WpRestAbilitiesV1AblitiesCategoriesController extends WP_UnitTestCase {

/**
* REST Server instance.
Expand DownExpand Up@@ -142,7 +143,7 @@ public function register_test_ability_categories(): void {
* @ticket 64098
*/
public function test_get_items(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -165,7 +166,7 @@ public function test_get_items(): void {
* @ticket 64098
*/
public function test_get_item(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -183,7 +184,7 @@ public function test_get_item(): void {
* @ticket 64098
*/
public function test_get_item_with_meta(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-communication' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-communication' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -201,7 +202,7 @@ public function test_get_item_with_meta(): void {
* @ticket 64098
*/
public function test_get_item_with_selected_fields(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( '_fields', 'slug,label' );
$response = $this->server->dispatch( $request );
add_filter( 'rest_post_dispatch', 'rest_filter_response_fields', 10, 3 );
Expand All@@ -224,7 +225,7 @@ public function test_get_item_with_selected_fields(): void {
* @expectedIncorrectUsage WP_Ability_Categories_Registry::get_registered
*/
public function test_get_item_not_found(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/non-existent' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/non-existent' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 404, $response->get_status() );
Expand All@@ -241,7 +242,7 @@ public function test_get_item_not_found(): void {
public function test_get_items_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -255,7 +256,7 @@ public function test_get_items_permission_denied(): void {
public function test_get_item_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -267,7 +268,7 @@ public function test_get_item_permission_denied(): void {
* @ticket 64098
*/
public function test_pagination_headers(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$response = $this->server->dispatch( $request );

Expand All@@ -288,7 +289,7 @@ public function test_pagination_headers(): void {
* @ticket 64098
*/
public function test_head_request(): void {
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$data = $response->get_data();
Expand All@@ -305,7 +306,7 @@ public function test_head_request(): void {
* @ticket 64098
*/
public function test_pagination_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$request->set_param( 'page', 1 );
$response = $this->server->dispatch( $request );
Expand DownExpand Up@@ -343,7 +344,7 @@ public function test_pagination_links(): void {
* @ticket 64098
*/
public function test_collection_params(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 5 );
$response = $this->server->dispatch( $request );

Expand All@@ -356,7 +357,7 @@ public function test_collection_params(): void {
$data = $response->get_data();
$this->assertCount( 5, $data );

$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$page1_request->set_param( 'per_page', 5 );
$page1_request->set_param( 'page', 1 );
$page1_response = $this->server->dispatch( $page1_request );
Expand All@@ -372,7 +373,7 @@ public function test_collection_params(): void {
* @ticket 64098
*/
public function test_ability_category_response_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$links = $response->get_links();
Expand All@@ -381,13 +382,13 @@ public function test_ability_category_response_links(): void {
$this->assertArrayHasKey( 'abilities', $links );

$self_link = $links['self'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories/test-data-retrieval', $self_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories/test-data-retrieval', $self_link );

$collection_link = $links['collection'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories', $collection_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories', $collection_link );

$abilities_link = $links['abilities'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/abilities?category=test-data-retrieval', $abilities_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities?ability_category=test-data-retrieval', $abilities_link );
}

/**
Expand All@@ -396,7 +397,7 @@ public function test_ability_category_response_links(): void {
* @ticket 64098
*/
public function test_context_parameter(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( 'context', 'view' );
$response = $this->server->dispatch( $request );

Expand All@@ -417,7 +418,7 @@ public function test_context_parameter(): void {
* @ticket 64098
*/
public function test_get_schema(): void {
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );
$data = $response->get_data();

Expand DownExpand Up@@ -448,7 +449,7 @@ public function test_get_schema(): void {
* @ticket 64098
*/
public function test_ability_category_slug_with_valid_format(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );
$this->assertEquals( 200, $response->get_status() );
}
Expand DownExpand Up@@ -479,7 +480,7 @@ public function data_invalid_ability_category_slugs_provider(): array {
* @param string $slug Invalid ability category slug to test.
*/
public function test_ability_category_slug_with_invalid_format( string $slug ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/' . $slug );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/' . $slug );
$response = $this->server->dispatch( $request );

$this->assertContains( $response->get_status(), array( 400, 404 ) );
Expand DownExpand Up@@ -512,7 +513,7 @@ public function data_invalid_pagination_params_provider(): array {
* @param array<string, mixed> $params Invalid pagination parameters.
*/
public function test_invalid_pagination_parameters( array $params ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_query_params( $params );

$response = $this->server->dispatch( $request );
Expand Down
6 changes: 3 additions & 3 deletions tests/qunit/fixtures/wp-api-generated.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12423,7 +12423,7 @@ mockedApiResponse.Schema = {
]
}
},
"/wp-abilities/v1/categories": {
"/wp-abilities/v1/abilities-categories": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand DownExpand Up@@ -12466,12 +12466,12 @@ mockedApiResponse.Schema = {
"_links": {
"self": [
{
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/categories"
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/abilities-categories"
}
]
}
},
"/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/rest-api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ function create_initial_rest_routes() {
$font_collections_controller->register_routes();

// Abilities.
$abilities_categories_controller = new WP_REST_Abilities_V1_Categories_Controller();
$abilities_categories_controller = new WP_REST_Abilities_V1_Abilities_Categories_Controller();
$abilities_categories_controller->register_routes();
$abilities_run_controller = new WP_REST_Abilities_V1_Run_Controller();
$abilities_run_controller->register_routes();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
*
* @see WP_REST_Controller
*/
class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
class WP_REST_Abilities_V1_Abilities_Categories_Controller extends WP_REST_Controller {

/**
* REST API namespace.
Expand All@@ -32,7 +32,7 @@ class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
* @since 6.9.0
* @var string
*/
protected $rest_base = 'categories';
protected $rest_base = 'abilities-categories';

/**
* Registers the routes for ability categories.
Expand DownExpand Up@@ -212,7 +212,7 @@ public function prepare_item_for_response( $category, $request ) {
'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
),
'abilities' => array(
'href' => rest_url( sprintf( '%s/abilities?category=%s', $this->namespace, $category->get_slug() ) ),
'href' => rest_url( sprintf( '%s/abilities?ability_category=%s', $this->namespace, $category->get_slug() ) ),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this parameter already get changed in another PR? I'm not seeing this change in this PR.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay as category param here, unless you also want to change the filtering in the list controller.

),
);

Expand Down
2 changes: 1 addition & 1 deletion src/wp-settings.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,7 +336,7 @@
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-families-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-faces-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-collections-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-abilities-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-run-controller.php';
require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php';
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/tests/rest-api/rest-schema-setup.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,8 +196,8 @@ public function test_expected_routes_in_schema() {
'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)',
'/wp/v2/font-families/(?P<id>[\d]+)',
'/wp-abilities/v1',
'/wp-abilities/v1/categories',
'/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities-categories',
'/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+?)/run',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+)',
'/wp-abilities/v1/abilities',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
*
* @group abilities-api
* @group rest-api
* @group abilities-categories
*/
class Tests_REST_API_WpRestAbilitiesV1CategoriesController extends WP_UnitTestCase {
class Tests_REST_API_WpRestAbilitiesV1AblitiesCategoriesController extends WP_UnitTestCase {

/**
* REST Server instance.
Expand DownExpand Up@@ -142,7 +143,7 @@ public function register_test_ability_categories(): void {
* @ticket 64098
*/
public function test_get_items(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -165,7 +166,7 @@ public function test_get_items(): void {
* @ticket 64098
*/
public function test_get_item(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -183,7 +184,7 @@ public function test_get_item(): void {
* @ticket 64098
*/
public function test_get_item_with_meta(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-communication' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-communication' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -201,7 +202,7 @@ public function test_get_item_with_meta(): void {
* @ticket 64098
*/
public function test_get_item_with_selected_fields(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( '_fields', 'slug,label' );
$response = $this->server->dispatch( $request );
add_filter( 'rest_post_dispatch', 'rest_filter_response_fields', 10, 3 );
Expand All@@ -224,7 +225,7 @@ public function test_get_item_with_selected_fields(): void {
* @expectedIncorrectUsage WP_Ability_Categories_Registry::get_registered
*/
public function test_get_item_not_found(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/non-existent' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/non-existent' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 404, $response->get_status() );
Expand All@@ -241,7 +242,7 @@ public function test_get_item_not_found(): void {
public function test_get_items_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -255,7 +256,7 @@ public function test_get_items_permission_denied(): void {
public function test_get_item_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -267,7 +268,7 @@ public function test_get_item_permission_denied(): void {
* @ticket 64098
*/
public function test_pagination_headers(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$response = $this->server->dispatch( $request );

Expand All@@ -288,7 +289,7 @@ public function test_pagination_headers(): void {
* @ticket 64098
*/
public function test_head_request(): void {
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$data = $response->get_data();
Expand All@@ -305,7 +306,7 @@ public function test_head_request(): void {
* @ticket 64098
*/
public function test_pagination_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$request->set_param( 'page', 1 );
$response = $this->server->dispatch( $request );
Expand DownExpand Up@@ -343,7 +344,7 @@ public function test_pagination_links(): void {
* @ticket 64098
*/
public function test_collection_params(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 5 );
$response = $this->server->dispatch( $request );

Expand All@@ -356,7 +357,7 @@ public function test_collection_params(): void {
$data = $response->get_data();
$this->assertCount( 5, $data );

$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$page1_request->set_param( 'per_page', 5 );
$page1_request->set_param( 'page', 1 );
$page1_response = $this->server->dispatch( $page1_request );
Expand All@@ -372,7 +373,7 @@ public function test_collection_params(): void {
* @ticket 64098
*/
public function test_ability_category_response_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$links = $response->get_links();
Expand All@@ -381,13 +382,13 @@ public function test_ability_category_response_links(): void {
$this->assertArrayHasKey( 'abilities', $links );

$self_link = $links['self'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories/test-data-retrieval', $self_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories/test-data-retrieval', $self_link );

$collection_link = $links['collection'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories', $collection_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories', $collection_link );

$abilities_link = $links['abilities'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/abilities?category=test-data-retrieval', $abilities_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities?ability_category=test-data-retrieval', $abilities_link );
}

/**
Expand All@@ -396,7 +397,7 @@ public function test_ability_category_response_links(): void {
* @ticket 64098
*/
public function test_context_parameter(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( 'context', 'view' );
$response = $this->server->dispatch( $request );

Expand All@@ -417,7 +418,7 @@ public function test_context_parameter(): void {
* @ticket 64098
*/
public function test_get_schema(): void {
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );
$data = $response->get_data();

Expand DownExpand Up@@ -448,7 +449,7 @@ public function test_get_schema(): void {
* @ticket 64098
*/
public function test_ability_category_slug_with_valid_format(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );
$this->assertEquals( 200, $response->get_status() );
}
Expand DownExpand Up@@ -479,7 +480,7 @@ public function data_invalid_ability_category_slugs_provider(): array {
* @param string $slug Invalid ability category slug to test.
*/
public function test_ability_category_slug_with_invalid_format( string $slug ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/' . $slug );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/' . $slug );
$response = $this->server->dispatch( $request );

$this->assertContains( $response->get_status(), array( 400, 404 ) );
Expand DownExpand Up@@ -512,7 +513,7 @@ public function data_invalid_pagination_params_provider(): array {
* @param array<string, mixed> $params Invalid pagination parameters.
*/
public function test_invalid_pagination_parameters( array $params ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_query_params( $params );

$response = $this->server->dispatch( $request );
Expand Down
6 changes: 3 additions & 3 deletions tests/qunit/fixtures/wp-api-generated.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12423,7 +12423,7 @@ mockedApiResponse.Schema = {
]
}
},
"/wp-abilities/v1/categories": {
"/wp-abilities/v1/abilities-categories": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand DownExpand Up@@ -12466,12 +12466,12 @@ mockedApiResponse.Schema = {
"_links": {
"self": [
{
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/categories"
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/abilities-categories"
}
]
}
},
"/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/rest-api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ function create_initial_rest_routes() {
$font_collections_controller->register_routes();

// Abilities.
$abilities_categories_controller = new WP_REST_Abilities_V1_Categories_Controller();
$abilities_categories_controller = new WP_REST_Abilities_V1_Abilities_Categories_Controller();
$abilities_categories_controller->register_routes();
$abilities_run_controller = new WP_REST_Abilities_V1_Run_Controller();
$abilities_run_controller->register_routes();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
*
* @see WP_REST_Controller
*/
class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
class WP_REST_Abilities_V1_Abilities_Categories_Controller extends WP_REST_Controller {

/**
* REST API namespace.
Expand All@@ -32,7 +32,7 @@ class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
* @since 6.9.0
* @var string
*/
protected $rest_base = 'categories';
protected $rest_base = 'abilities-categories';

/**
* Registers the routes for ability categories.
Expand DownExpand Up@@ -212,7 +212,7 @@ public function prepare_item_for_response( $category, $request ) {
'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
),
'abilities' => array(
'href' => rest_url( sprintf( '%s/abilities?category=%s', $this->namespace, $category->get_slug() ) ),
'href' => rest_url( sprintf( '%s/abilities?ability_category=%s', $this->namespace, $category->get_slug() ) ),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this parameter already get changed in another PR? I'm not seeing this change in this PR.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay as category param here, unless you also want to change the filtering in the list controller.

),
);

Expand Down
2 changes: 1 addition & 1 deletion src/wp-settings.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,7 +336,7 @@
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-families-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-faces-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-collections-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-abilities-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-run-controller.php';
require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php';
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/tests/rest-api/rest-schema-setup.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,8 +196,8 @@ public function test_expected_routes_in_schema() {
'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)',
'/wp/v2/font-families/(?P<id>[\d]+)',
'/wp-abilities/v1',
'/wp-abilities/v1/categories',
'/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities-categories',
'/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+?)/run',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+)',
'/wp-abilities/v1/abilities',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
*
* @group abilities-api
* @group rest-api
* @group abilities-categories
*/
class Tests_REST_API_WpRestAbilitiesV1CategoriesController extends WP_UnitTestCase {
class Tests_REST_API_WpRestAbilitiesV1AblitiesCategoriesController extends WP_UnitTestCase {

/**
* REST Server instance.
Expand DownExpand Up@@ -142,7 +143,7 @@ public function register_test_ability_categories(): void {
* @ticket 64098
*/
public function test_get_items(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -165,7 +166,7 @@ public function test_get_items(): void {
* @ticket 64098
*/
public function test_get_item(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -183,7 +184,7 @@ public function test_get_item(): void {
* @ticket 64098
*/
public function test_get_item_with_meta(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-communication' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-communication' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -201,7 +202,7 @@ public function test_get_item_with_meta(): void {
* @ticket 64098
*/
public function test_get_item_with_selected_fields(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( '_fields', 'slug,label' );
$response = $this->server->dispatch( $request );
add_filter( 'rest_post_dispatch', 'rest_filter_response_fields', 10, 3 );
Expand All@@ -224,7 +225,7 @@ public function test_get_item_with_selected_fields(): void {
* @expectedIncorrectUsage WP_Ability_Categories_Registry::get_registered
*/
public function test_get_item_not_found(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/non-existent' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/non-existent' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 404, $response->get_status() );
Expand All@@ -241,7 +242,7 @@ public function test_get_item_not_found(): void {
public function test_get_items_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -255,7 +256,7 @@ public function test_get_items_permission_denied(): void {
public function test_get_item_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -267,7 +268,7 @@ public function test_get_item_permission_denied(): void {
* @ticket 64098
*/
public function test_pagination_headers(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$response = $this->server->dispatch( $request );

Expand All@@ -288,7 +289,7 @@ public function test_pagination_headers(): void {
* @ticket 64098
*/
public function test_head_request(): void {
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$data = $response->get_data();
Expand All@@ -305,7 +306,7 @@ public function test_head_request(): void {
* @ticket 64098
*/
public function test_pagination_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$request->set_param( 'page', 1 );
$response = $this->server->dispatch( $request );
Expand DownExpand Up@@ -343,7 +344,7 @@ public function test_pagination_links(): void {
* @ticket 64098
*/
public function test_collection_params(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 5 );
$response = $this->server->dispatch( $request );

Expand All@@ -356,7 +357,7 @@ public function test_collection_params(): void {
$data = $response->get_data();
$this->assertCount( 5, $data );

$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$page1_request->set_param( 'per_page', 5 );
$page1_request->set_param( 'page', 1 );
$page1_response = $this->server->dispatch( $page1_request );
Expand All@@ -372,7 +373,7 @@ public function test_collection_params(): void {
* @ticket 64098
*/
public function test_ability_category_response_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$links = $response->get_links();
Expand All@@ -381,13 +382,13 @@ public function test_ability_category_response_links(): void {
$this->assertArrayHasKey( 'abilities', $links );

$self_link = $links['self'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories/test-data-retrieval', $self_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories/test-data-retrieval', $self_link );

$collection_link = $links['collection'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories', $collection_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories', $collection_link );

$abilities_link = $links['abilities'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/abilities?category=test-data-retrieval', $abilities_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities?ability_category=test-data-retrieval', $abilities_link );
}

/**
Expand All@@ -396,7 +397,7 @@ public function test_ability_category_response_links(): void {
* @ticket 64098
*/
public function test_context_parameter(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( 'context', 'view' );
$response = $this->server->dispatch( $request );

Expand All@@ -417,7 +418,7 @@ public function test_context_parameter(): void {
* @ticket 64098
*/
public function test_get_schema(): void {
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );
$data = $response->get_data();

Expand DownExpand Up@@ -448,7 +449,7 @@ public function test_get_schema(): void {
* @ticket 64098
*/
public function test_ability_category_slug_with_valid_format(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );
$this->assertEquals( 200, $response->get_status() );
}
Expand DownExpand Up@@ -479,7 +480,7 @@ public function data_invalid_ability_category_slugs_provider(): array {
* @param string $slug Invalid ability category slug to test.
*/
public function test_ability_category_slug_with_invalid_format( string $slug ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/' . $slug );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/' . $slug );
$response = $this->server->dispatch( $request );

$this->assertContains( $response->get_status(), array( 400, 404 ) );
Expand DownExpand Up@@ -512,7 +513,7 @@ public function data_invalid_pagination_params_provider(): array {
* @param array<string, mixed> $params Invalid pagination parameters.
*/
public function test_invalid_pagination_parameters( array $params ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_query_params( $params );

$response = $this->server->dispatch( $request );
Expand Down
6 changes: 3 additions & 3 deletions tests/qunit/fixtures/wp-api-generated.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12423,7 +12423,7 @@ mockedApiResponse.Schema = {
]
}
},
"/wp-abilities/v1/categories": {
"/wp-abilities/v1/abilities-categories": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand DownExpand Up@@ -12466,12 +12466,12 @@ mockedApiResponse.Schema = {
"_links": {
"self": [
{
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/categories"
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/abilities-categories"
}
]
}
},
"/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/rest-api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ function create_initial_rest_routes() {
$font_collections_controller->register_routes();

// Abilities.
$abilities_categories_controller = new WP_REST_Abilities_V1_Categories_Controller();
$abilities_categories_controller = new WP_REST_Abilities_V1_Abilities_Categories_Controller();
$abilities_categories_controller->register_routes();
$abilities_run_controller = new WP_REST_Abilities_V1_Run_Controller();
$abilities_run_controller->register_routes();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
*
* @see WP_REST_Controller
*/
class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
class WP_REST_Abilities_V1_Abilities_Categories_Controller extends WP_REST_Controller {

/**
* REST API namespace.
Expand All@@ -32,7 +32,7 @@ class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
* @since 6.9.0
* @var string
*/
protected $rest_base = 'categories';
protected $rest_base = 'abilities-categories';

/**
* Registers the routes for ability categories.
Expand DownExpand Up@@ -212,7 +212,7 @@ public function prepare_item_for_response( $category, $request ) {
'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
),
'abilities' => array(
'href' => rest_url( sprintf( '%s/abilities?category=%s', $this->namespace, $category->get_slug() ) ),
'href' => rest_url( sprintf( '%s/abilities?ability_category=%s', $this->namespace, $category->get_slug() ) ),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this parameter already get changed in another PR? I'm not seeing this change in this PR.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay as category param here, unless you also want to change the filtering in the list controller.

),
);

Expand Down
2 changes: 1 addition & 1 deletion src/wp-settings.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,7 +336,7 @@
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-families-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-faces-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-collections-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-abilities-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-run-controller.php';
require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php';
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/tests/rest-api/rest-schema-setup.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,8 +196,8 @@ public function test_expected_routes_in_schema() {
'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)',
'/wp/v2/font-families/(?P<id>[\d]+)',
'/wp-abilities/v1',
'/wp-abilities/v1/categories',
'/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities-categories',
'/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+?)/run',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+)',
'/wp-abilities/v1/abilities',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
*
* @group abilities-api
* @group rest-api
* @group abilities-categories
*/
class Tests_REST_API_WpRestAbilitiesV1CategoriesController extends WP_UnitTestCase {
class Tests_REST_API_WpRestAbilitiesV1AblitiesCategoriesController extends WP_UnitTestCase {

/**
* REST Server instance.
Expand DownExpand Up@@ -142,7 +143,7 @@ public function register_test_ability_categories(): void {
* @ticket 64098
*/
public function test_get_items(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -165,7 +166,7 @@ public function test_get_items(): void {
* @ticket 64098
*/
public function test_get_item(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -183,7 +184,7 @@ public function test_get_item(): void {
* @ticket 64098
*/
public function test_get_item_with_meta(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-communication' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-communication' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -201,7 +202,7 @@ public function test_get_item_with_meta(): void {
* @ticket 64098
*/
public function test_get_item_with_selected_fields(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( '_fields', 'slug,label' );
$response = $this->server->dispatch( $request );
add_filter( 'rest_post_dispatch', 'rest_filter_response_fields', 10, 3 );
Expand All@@ -224,7 +225,7 @@ public function test_get_item_with_selected_fields(): void {
* @expectedIncorrectUsage WP_Ability_Categories_Registry::get_registered
*/
public function test_get_item_not_found(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/non-existent' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/non-existent' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 404, $response->get_status() );
Expand All@@ -241,7 +242,7 @@ public function test_get_item_not_found(): void {
public function test_get_items_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -255,7 +256,7 @@ public function test_get_items_permission_denied(): void {
public function test_get_item_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -267,7 +268,7 @@ public function test_get_item_permission_denied(): void {
* @ticket 64098
*/
public function test_pagination_headers(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$response = $this->server->dispatch( $request );

Expand All@@ -288,7 +289,7 @@ public function test_pagination_headers(): void {
* @ticket 64098
*/
public function test_head_request(): void {
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$data = $response->get_data();
Expand All@@ -305,7 +306,7 @@ public function test_head_request(): void {
* @ticket 64098
*/
public function test_pagination_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$request->set_param( 'page', 1 );
$response = $this->server->dispatch( $request );
Expand DownExpand Up@@ -343,7 +344,7 @@ public function test_pagination_links(): void {
* @ticket 64098
*/
public function test_collection_params(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 5 );
$response = $this->server->dispatch( $request );

Expand All@@ -356,7 +357,7 @@ public function test_collection_params(): void {
$data = $response->get_data();
$this->assertCount( 5, $data );

$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$page1_request->set_param( 'per_page', 5 );
$page1_request->set_param( 'page', 1 );
$page1_response = $this->server->dispatch( $page1_request );
Expand All@@ -372,7 +373,7 @@ public function test_collection_params(): void {
* @ticket 64098
*/
public function test_ability_category_response_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$links = $response->get_links();
Expand All@@ -381,13 +382,13 @@ public function test_ability_category_response_links(): void {
$this->assertArrayHasKey( 'abilities', $links );

$self_link = $links['self'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories/test-data-retrieval', $self_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories/test-data-retrieval', $self_link );

$collection_link = $links['collection'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories', $collection_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories', $collection_link );

$abilities_link = $links['abilities'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/abilities?category=test-data-retrieval', $abilities_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities?ability_category=test-data-retrieval', $abilities_link );
}

/**
Expand All@@ -396,7 +397,7 @@ public function test_ability_category_response_links(): void {
* @ticket 64098
*/
public function test_context_parameter(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( 'context', 'view' );
$response = $this->server->dispatch( $request );

Expand All@@ -417,7 +418,7 @@ public function test_context_parameter(): void {
* @ticket 64098
*/
public function test_get_schema(): void {
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );
$data = $response->get_data();

Expand DownExpand Up@@ -448,7 +449,7 @@ public function test_get_schema(): void {
* @ticket 64098
*/
public function test_ability_category_slug_with_valid_format(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );
$this->assertEquals( 200, $response->get_status() );
}
Expand DownExpand Up@@ -479,7 +480,7 @@ public function data_invalid_ability_category_slugs_provider(): array {
* @param string $slug Invalid ability category slug to test.
*/
public function test_ability_category_slug_with_invalid_format( string $slug ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/' . $slug );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/' . $slug );
$response = $this->server->dispatch( $request );

$this->assertContains( $response->get_status(), array( 400, 404 ) );
Expand DownExpand Up@@ -512,7 +513,7 @@ public function data_invalid_pagination_params_provider(): array {
* @param array<string, mixed> $params Invalid pagination parameters.
*/
public function test_invalid_pagination_parameters( array $params ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_query_params( $params );

$response = $this->server->dispatch( $request );
Expand Down
6 changes: 3 additions & 3 deletions tests/qunit/fixtures/wp-api-generated.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12423,7 +12423,7 @@ mockedApiResponse.Schema = {
]
}
},
"/wp-abilities/v1/categories": {
"/wp-abilities/v1/abilities-categories": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand DownExpand Up@@ -12466,12 +12466,12 @@ mockedApiResponse.Schema = {
"_links": {
"self": [
{
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/categories"
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/abilities-categories"
}
]
}
},
"/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/rest-api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ function create_initial_rest_routes() {
$font_collections_controller->register_routes();

// Abilities.
$abilities_categories_controller = new WP_REST_Abilities_V1_Categories_Controller();
$abilities_categories_controller = new WP_REST_Abilities_V1_Abilities_Categories_Controller();
$abilities_categories_controller->register_routes();
$abilities_run_controller = new WP_REST_Abilities_V1_Run_Controller();
$abilities_run_controller->register_routes();
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
*
* @see WP_REST_Controller
*/
class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
class WP_REST_Abilities_V1_Abilities_Categories_Controller extends WP_REST_Controller {

/**
* REST API namespace.
Expand All@@ -32,7 +32,7 @@ class WP_REST_Abilities_V1_Categories_Controller extends WP_REST_Controller {
* @since 6.9.0
* @var string
*/
protected $rest_base = 'categories';
protected $rest_base = 'abilities-categories';

/**
* Registers the routes for ability categories.
Expand DownExpand Up@@ -212,7 +212,7 @@ public function prepare_item_for_response( $category, $request ) {
'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
),
'abilities' => array(
'href' => rest_url( sprintf( '%s/abilities?category=%s', $this->namespace, $category->get_slug() ) ),
'href' => rest_url( sprintf( '%s/abilities?ability_category=%s', $this->namespace, $category->get_slug() ) ),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this parameter already get changed in another PR? I'm not seeing this change in this PR.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay as category param here, unless you also want to change the filtering in the list controller.

),
);

Expand Down
2 changes: 1 addition & 1 deletion src/wp-settings.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -336,7 +336,7 @@
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-families-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-faces-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-font-collections-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-abilities-categories-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php';
require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-abilities-v1-run-controller.php';
require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php';
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/tests/rest-api/rest-schema-setup.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,8 +196,8 @@ public function test_expected_routes_in_schema() {
'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)',
'/wp/v2/font-families/(?P<id>[\d]+)',
'/wp-abilities/v1',
'/wp-abilities/v1/categories',
'/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities-categories',
'/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+?)/run',
'/wp-abilities/v1/abilities/(?P<name>[a-zA-Z0-9\-\/]+)',
'/wp-abilities/v1/abilities',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,9 @@
*
* @group abilities-api
* @group rest-api
* @group abilities-categories
*/
class Tests_REST_API_WpRestAbilitiesV1CategoriesController extends WP_UnitTestCase {
class Tests_REST_API_WpRestAbilitiesV1AblitiesCategoriesController extends WP_UnitTestCase {

/**
* REST Server instance.
Expand DownExpand Up@@ -142,7 +143,7 @@ public function register_test_ability_categories(): void {
* @ticket 64098
*/
public function test_get_items(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -165,7 +166,7 @@ public function test_get_items(): void {
* @ticket 64098
*/
public function test_get_item(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -183,7 +184,7 @@ public function test_get_item(): void {
* @ticket 64098
*/
public function test_get_item_with_meta(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-communication' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-communication' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 200, $response->get_status() );
Expand All@@ -201,7 +202,7 @@ public function test_get_item_with_meta(): void {
* @ticket 64098
*/
public function test_get_item_with_selected_fields(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( '_fields', 'slug,label' );
$response = $this->server->dispatch( $request );
add_filter( 'rest_post_dispatch', 'rest_filter_response_fields', 10, 3 );
Expand All@@ -224,7 +225,7 @@ public function test_get_item_with_selected_fields(): void {
* @expectedIncorrectUsage WP_Ability_Categories_Registry::get_registered
*/
public function test_get_item_not_found(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/non-existent' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/non-existent' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 404, $response->get_status() );
Expand All@@ -241,7 +242,7 @@ public function test_get_item_not_found(): void {
public function test_get_items_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -255,7 +256,7 @@ public function test_get_items_permission_denied(): void {
public function test_get_item_permission_denied(): void {
wp_set_current_user( 0 );

$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$this->assertEquals( 401, $response->get_status() );
Expand All@@ -267,7 +268,7 @@ public function test_get_item_permission_denied(): void {
* @ticket 64098
*/
public function test_pagination_headers(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$response = $this->server->dispatch( $request );

Expand All@@ -288,7 +289,7 @@ public function test_pagination_headers(): void {
* @ticket 64098
*/
public function test_head_request(): void {
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'HEAD', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );

$data = $response->get_data();
Expand All@@ -305,7 +306,7 @@ public function test_head_request(): void {
* @ticket 64098
*/
public function test_pagination_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 10 );
$request->set_param( 'page', 1 );
$response = $this->server->dispatch( $request );
Expand DownExpand Up@@ -343,7 +344,7 @@ public function test_pagination_links(): void {
* @ticket 64098
*/
public function test_collection_params(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_param( 'per_page', 5 );
$response = $this->server->dispatch( $request );

Expand All@@ -356,7 +357,7 @@ public function test_collection_params(): void {
$data = $response->get_data();
$this->assertCount( 5, $data );

$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$page1_request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$page1_request->set_param( 'per_page', 5 );
$page1_request->set_param( 'page', 1 );
$page1_response = $this->server->dispatch( $page1_request );
Expand All@@ -372,7 +373,7 @@ public function test_collection_params(): void {
* @ticket 64098
*/
public function test_ability_category_response_links(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );

$links = $response->get_links();
Expand All@@ -381,13 +382,13 @@ public function test_ability_category_response_links(): void {
$this->assertArrayHasKey( 'abilities', $links );

$self_link = $links['self'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories/test-data-retrieval', $self_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories/test-data-retrieval', $self_link );

$collection_link = $links['collection'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/categories', $collection_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities-categories', $collection_link );

$abilities_link = $links['abilities'][0]['href'];
$this->assertStringContainsString( '/wp-abilities/v1/abilities?category=test-data-retrieval', $abilities_link );
$this->assertStringContainsString( '/wp-abilities/v1/abilities?ability_category=test-data-retrieval', $abilities_link );
}

/**
Expand All@@ -396,7 +397,7 @@ public function test_ability_category_response_links(): void {
* @ticket 64098
*/
public function test_context_parameter(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$request->set_param( 'context', 'view' );
$response = $this->server->dispatch( $request );

Expand All@@ -417,7 +418,7 @@ public function test_context_parameter(): void {
* @ticket 64098
*/
public function test_get_schema(): void {
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'OPTIONS', '/wp-abilities/v1/abilities-categories' );
$response = $this->server->dispatch( $request );
$data = $response->get_data();

Expand DownExpand Up@@ -448,7 +449,7 @@ public function test_get_schema(): void {
* @ticket 64098
*/
public function test_ability_category_slug_with_valid_format(): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/test-data-retrieval' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/test-data-retrieval' );
$response = $this->server->dispatch( $request );
$this->assertEquals( 200, $response->get_status() );
}
Expand DownExpand Up@@ -479,7 +480,7 @@ public function data_invalid_ability_category_slugs_provider(): array {
* @param string $slug Invalid ability category slug to test.
*/
public function test_ability_category_slug_with_invalid_format( string $slug ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories/' . $slug );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories/' . $slug );
$response = $this->server->dispatch( $request );

$this->assertContains( $response->get_status(), array( 400, 404 ) );
Expand DownExpand Up@@ -512,7 +513,7 @@ public function data_invalid_pagination_params_provider(): array {
* @param array<string, mixed> $params Invalid pagination parameters.
*/
public function test_invalid_pagination_parameters( array $params ): void {
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/categories' );
$request = new WP_REST_Request( 'GET', '/wp-abilities/v1/abilities-categories' );
$request->set_query_params( $params );

$response = $this->server->dispatch( $request );
Expand Down
6 changes: 3 additions & 3 deletions tests/qunit/fixtures/wp-api-generated.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12423,7 +12423,7 @@ mockedApiResponse.Schema = {
]
}
},
"/wp-abilities/v1/categories": {
"/wp-abilities/v1/abilities-categories": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand DownExpand Up@@ -12466,12 +12466,12 @@ mockedApiResponse.Schema = {
"_links": {
"self": [
{
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/categories"
"href": "http://example.org/index.php?rest_route=/wp-abilities/v1/abilities-categories"
}
]
}
},
"/wp-abilities/v1/categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"/wp-abilities/v1/abilities-categories/(?P<slug>[a-z0-9]+(?:-[a-z0-9]+)*)": {
"namespace": "wp-abilities/v1",
"methods": [
"GET"
Expand Down
Loading