Changeset 51908 for trunk/tests/phpunit/tests/rest-api/rest-controller.php

Timestamp:

10/15/2021 02:03:38 AM (3 years ago)

Author:

rachelbaker

Message:

REST API: Add text-field and textarea-field as available schema formats for string sanitization.

Props ocean90, TimothyBlynJacobs.
Fixes #49960.

File:

• trunk/tests/phpunit/tests/rest-api/rest-controller.php (modified) (5 diffs)

trunk/tests/phpunit/tests/rest-api/rest-controller.php

@@ -24 +24 @@
             array(
                 'args' => array(
-                    'someinteger' => array(
+                    'someinteger'       => array(
                         'type' => 'integer',
                     ),
-                    'someboolean' => array(
+                    'someboolean'       => array(
                         'type' => 'boolean',
                     ),
-                    'somestring'  => array(
+                    'somestring'        => array(
                         'type' => 'string',
                     ),
-                    'somehex'     => array(
+                    'somehex'           => array(
                         'type'   => 'string',
                         'format' => 'hex-color',
                     ),
-                    'someenum'    => array(
+                    'someenum'          => array(
                         'type' => 'string',
                         'enum' => array( 'a' ),
                     ),
-                    'somedate'    => array(
+                    'somedate'          => array(
                         'type'   => 'string',
                         'format' => 'date-time',
                     ),
-                    'someemail'   => array(
+                    'someemail'         => array(
                         'type'   => 'string',
                         'format' => 'email',
                     ),
-                    'someuuid'    => array(
+                    'someuuid'          => array(
                         'type'   => 'string',
                         'format' => 'uuid',
+                    ),
+                    'sometextfield'     => array(
+                        'type'   => 'string',
+                        'format' => 'text-field',
+                    ),
+                    'sometextareafield' => array(
+                        'type'   => 'string',
+                        'format' => 'textarea-field',
                     ),
                 ),
@@ -217 +225 @@
             'rest_invalid_uuid',
             rest_validate_request_arg( '123e4567-e89b-12d3-a456-426655440000X', $this->request, 'someuuid' )
+        );
+    }
+
+    /**
+     * @ticket 49960
+     */
+    public function test_validate_schema_format_text_field() {
+        $this->assertTrue(
+            rest_validate_request_arg( 'Hello World', $this->request, 'sometextfield' )
+        );
+
+        $this->assertErrorResponse(
+            'rest_invalid_type',
+            rest_validate_request_arg( false, $this->request, 'sometextfield' )
+        );
+
+        $this->assertSame(
+            'Hello World',
+            rest_sanitize_request_arg( 'Hello World', $this->request, 'sometextfield' )
+        );
+        $this->assertSame(
+            'Hello World',
+            rest_sanitize_request_arg( '<p>Hello World</p>', $this->request, 'sometextfield' )
+        );
+    }
+
+    /**
+     * @ticket 49960
+     */
+    public function test_validate_schema_format_textarea_field() {
+        $this->assertTrue(
+            rest_validate_request_arg( "Hello\nWorld", $this->request, 'sometextareafield' )
+        );
+
+        $this->assertErrorResponse(
+            'rest_invalid_type',
+            rest_validate_request_arg( false, $this->request, 'sometextareafield' )
+        );
+
+        $this->assertSame(
+            "Hello\nWorld",
+            rest_sanitize_request_arg( "Hello\nWorld", $this->request, 'sometextareafield' )
+        );
+        $this->assertSame(
+            "Hello\nWorld",
+            rest_sanitize_request_arg( "<p>Hello\nWorld</p>", $this->request, 'sometextareafield' )
         );
     }
@@ -235 +289 @@
         $this->assertArrayHasKey( 'somehex', $args );
         $this->assertArrayHasKey( 'someuuid', $args );
+        $this->assertArrayHasKey( 'sometextfield', $args );
+        $this->assertArrayHasKey( 'sometextareafield', $args );
         $this->assertArrayHasKey( 'someenum', $args );
         $this->assertArrayHasKey( 'someargoptions', $args );
@@ -324 +380 @@
                 'somehex',
                 'someuuid',
+                'sometextfield',
+                'sometextareafield',
                 'someenum',
                 'someargoptions',
@@ -357 +415 @@
                     'somehex',
                     'someuuid',
+                    'sometextfield',
+                    'sometextareafield',
                     'someenum',
                     'someargoptions',