Changeset 61983 for trunk/tests/phpunit/tests/connectors/wpConnectorsGetConnectorSettings.php

Timestamp:

03/12/2026 07:54:50 AM (7 months ago)

Author:

gziolo

Message:

Connectors: Remove redundant helper and improve PHPDoc

Remove _wp_connectors_get_connector_settings() and inline ksort()
into _wp_connectors_get_connector_script_module_data(). Expand
@return and @phpstan-return array shapes for wp_get_connector()
and wp_get_connectors(). Make logo_url and credentials_url truly
optional. Rename test class to wpGetConnectors.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/11227.

Follow-up to [61943].

Props gziolo, westonruter.
Fixes #64791.

File:

• trunk/tests/phpunit/tests/connectors/wpConnectorsGetConnectorSettings.php (modified) (10 diffs)

trunk/tests/phpunit/tests/connectors/wpConnectorsGetConnectorSettings.php

@@ -4 +4 @@
 
 /**
- * Tests for _wp_connectors_get_connector_settings().
+ * Tests for wp_get_connectors().
  *
  * @group connectors
- * @covers ::_wp_connectors_get_connector_settings
+ * @covers ::wp_get_connectors
  */
-class Tests_Connectors_WpConnectorsGetConnectorSettings extends WP_UnitTestCase {
+class Tests_Connectors_WpGetConnectors extends WP_UnitTestCase {
 
         use WP_AI_Client_Mock_Provider_Trait;
@@ -16 +16 @@
          * Registers the mock provider once before any tests in this class run.
          */
-        public static function set_up_before_class() {
+        public static function set_up_before_class(): void {
                 parent::set_up_before_class();
                 self::register_mock_connectors_provider();
@@ -24 +24 @@
          * Unregisters the mock provider setting added by `init`.
          */
-        public static function tear_down_after_class() {
+        public static function tear_down_after_class(): void {
                 self::unregister_mock_connector_setting();
                 parent::tear_down_after_class();
@@ -32 +32 @@
          * @ticket 64730
          */
-        public function test_returns_expected_connector_keys() {
-                $connectors = _wp_connectors_get_connector_settings();
+        public function test_returns_expected_connector_keys(): void {
+                $connectors = wp_get_connectors();
 
                 $this->assertArrayHasKey( 'google', $connectors );
@@ -45 +45 @@
          * @ticket 64730
          */
-        public function test_each_connector_has_required_fields() {
-                $connectors = _wp_connectors_get_connector_settings();
+        public function test_each_connector_has_required_fields(): void {
+                $connectors = wp_get_connectors();
 
                 $this->assertNotEmpty( $connectors, 'Connector settings should not be empty.' );
@@ -68 +68 @@
          * @ticket 64730
          */
-        public function test_api_key_connectors_have_setting_name_and_credentials_url() {
-                $connectors    = _wp_connectors_get_connector_settings();
+        public function test_api_key_connectors_have_setting_name_and_credentials_url(): void {
+                $connectors    = wp_get_connectors();
                 $api_key_count = 0;
 
@@ -82 +82 @@
                         $this->assertSame(
                                 "connectors_ai_{$connector_id}_api_key",
-                                $connector_data['authentication']['setting_name'],
+                                $connector_data['authentication']['setting_name'] ?? null,
                                 "Connector '{$connector_id}' setting_name does not match expected format."
                         );
-                        $this->assertArrayHasKey( 'credentials_url', $connector_data['authentication'], "Connector '{$connector_id}' authentication is missing 'credentials_url'." );
                 }
 
@@ -94 +93 @@
          * @ticket 64730
          */
-        public function test_featured_provider_names_match_expected() {
-                $connectors = _wp_connectors_get_connector_settings();
+        public function test_featured_provider_names_match_expected(): void {
+                $connectors = wp_get_connectors();
 
                 $this->assertSame( 'Google', $connectors['google']['name'] );
@@ -105 +104 @@
          * @ticket 64730
          */
-        public function test_includes_registered_provider_from_registry() {
-                $connectors = _wp_connectors_get_connector_settings();
+        public function test_includes_registered_provider_from_registry(): void {
+                $connectors = wp_get_connectors();
                 $mock       = $connectors['mock_connectors_test'];
 
@@ -113 +112 @@
                 $this->assertSame( 'ai_provider', $mock['type'] );
                 $this->assertSame( 'api_key', $mock['authentication']['method'] );
-                $this->assertNull( $mock['authentication']['credentials_url'] );
-                $this->assertSame( 'connectors_ai_mock_connectors_test_api_key', $mock['authentication']['setting_name'] );
-        }
-
-        /**
-         * @ticket 64730
-         */
-        public function test_connectors_are_sorted_alphabetically() {
-                $connectors = _wp_connectors_get_connector_settings();
-                $keys       = array_keys( $connectors );
-                $sorted     = $keys;
-                sort( $sorted );
-
-                $this->assertSame( $sorted, $keys, 'Connectors should be sorted alphabetically by ID.' );
+                $this->assertNull( $mock['authentication']['credentials_url'] ?? null );
+                $this->assertSame( 'connectors_ai_mock_connectors_test_api_key', $mock['authentication']['setting_name'] ?? null );
         }
 }