Updated tests for HtmlHelper::textarea()

brucelin · Nov 28, 2016 · 63e6509 · 63e6509
1 parent 10ad620
commit 63e6509
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/framework/helpers/BaseHtml.php b/framework/helpers/BaseHtml.php
@@ -670,7 +670,6 @@ public static function fileInput($name, $value = null, $options = [])
     public static function textarea($name, $value = '', $options = [])
     {
         $options['name'] = $name;
-        // Get value, then remove from array - not needed for `renderTagAttributes` called inside the `tag` method
         $doubleEncode = ArrayHelper::remove($options, 'doubleEncode', true);
         return static::tag('textarea', static::encode($value, $doubleEncode), $options);
     }

diff --git a/tests/framework/helpers/HtmlTest.php b/tests/framework/helpers/HtmlTest.php
@@ -213,10 +213,45 @@ public function testFileInput()
         $this->assertEquals('<input type="file" class="t" name="test" value="value">', Html::fileInput('test', 'value', ['class' => 't']));
     }
 
-    public function testTextarea()
+    /**
+     * @return array
+     */
+    public function textareaDataProvider()
+    {
+        return [
+            [
+                '<textarea name="test"></textarea>',
+                'test',
+                null,
+                []
+            ],
+            [
+                '<textarea class="t" name="test">value&lt;&gt;</textarea>',
+                'test',
+                'value<>',
+                ['class' => 't']
+            ],
+            [
+                '<textarea name="test">value&amp;lt;&amp;gt;</textarea>',
+                'test',
+                'value&lt;&gt;',
+                []
+            ],
+            [
+                '<textarea name="test">value&lt;&gt;</textarea>',
+                'test',
+                'value&lt;&gt;',
+                ['doubleEncode' => false]
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider textareaDataProvider
+     */
+    public function testTextarea($expected, $name, $value, $options)
     {
-        $this->assertEquals('<textarea name="test"></textarea>', Html::textarea('test'));
-        $this->assertEquals('<textarea class="t" name="test">value&lt;&gt;</textarea>', Html::textarea('test', 'value<>', ['class' => 't']));
+        $this->assertEquals($expected, Html::textarea($name, $value, $options));
     }
 
     public function testRadio()