Refactor Summernote widget and add tests.

yii2-extensions · Nov 27, 2023 · 326e81f · 326e81f
1 parent bc1d01d
commit 326e81f
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 3 deletions.
diff --git a/src/Summernote.php b/src/Summernote.php
@@ -9,6 +9,7 @@
 use PHPForge\Html\TextArea;
 use Yii2\Extensions\Summernote\Asset\SummernoteAsset;
 use Yii;
+use yii\helpers\Html;
 use yii\widgets\InputWidget;
 
 final class Summernote extends InputWidget
@@ -78,16 +79,16 @@ private function renderTextArea(): string
     {
         unset($this->options['id']);
 
-        $textArea = TextArea::widget()
-            ->attributes($this->options)
-            ->content((string) $this->value);
+        $textArea = TextArea::widget()->attributes($this->options);
 
         return match ($this->hasModel()) {
             true => $textArea
+                ->content(Html::getAttributeValue($this->model, $this->attribute))
                 ->id($this->id)
                 ->name(Utils::generateInputName($this->model->formName(), $this->attribute))
                 ->render(),
             default => $textArea
+                ->content($this->value ?? '')
                 ->id($this->id)
                 ->name($this->name)
                 ->render(),

diff --git a/tests/RenderTest.php b/tests/RenderTest.php
@@ -18,6 +18,8 @@ public function setup(): void
         parent::setUp();
         $this->mockApplication();
 
+        Summernote::$counter = 0;
+
         $this->view = Yii::$app->getView();
     }
 
@@ -120,4 +122,59 @@ public function testRender(): void
             $result,
         );
     }
+
+    public function testValue(): void
+    {
+        $filePond = Summernote::widget(
+            [
+                'name' => 'content',
+                'value' => 'test-content',
+            ],
+        );
+
+        $this->assertSame(
+            <<<HTML
+            <textarea id="w0-summernote" name="content">test-content</textarea>
+            HTML,
+            $filePond,
+        );
+
+        $result = $this->view->renderFile(__DIR__ . '/Support/main.php', ['widget' => $filePond]);
+
+        $this->assertStringContainsString(
+            <<<JS
+             $('#w0-summernote').summernote({"lang":"en-US"});
+            JS,
+            $result,
+        );
+    }
+
+    public function testValueWithModel(): void
+    {
+        $model = new TestForm();
+        $model->content = 'test-content';
+
+        $filePond = Summernote::widget(
+            [
+                'attribute' => 'content',
+                'model' => $model,
+            ],
+        );
+
+        $this->assertSame(
+            <<<HTML
+            <textarea id="testform-content" name="TestForm[content]">test-content</textarea>
+            HTML,
+            $filePond,
+        );
+
+        $result = $this->view->renderFile(__DIR__ . '/Support/main.php', ['widget' => $filePond]);
+
+        $this->assertStringContainsString(
+            <<<JS
+             $('#testform-content').summernote({"lang":"en-US"});
+            JS,
+            $result,
+        );
+    }
 }