tests: add more tests

bernard-ng · bernard-ng · commit 7c52f851d6e3 · 2025-04-18T13:57:04.000+02:00
diff --git a/composer.lock b/composer.lock
diff --git a/src/Blocks/Code.php b/src/Blocks/Code.php
@@ -36,6 +36,7 @@ protected function __construct(string $id, string $type, array $data, ?array $tu
     {
         Assert::eq($type, self::NAME);
         Assert::keyExists($data, 'code');
+        Assert::string($data['code']);
 
         parent::__construct($id, $type, $data, $tunes, $allowedTags);
     }
diff --git a/src/Blocks/Delimiter.php b/src/Blocks/Delimiter.php
@@ -43,7 +43,7 @@ protected function __construct(string $id, string $type, array $data, ?array $tu
     public function toHtml(): string
     {
         return <<<HTML
-        <hr id="{$this->id}">
+        <hr id="{$this->id}" />
         HTML;
     }
 }
diff --git a/src/Blocks/Embed.php b/src/Blocks/Embed.php
@@ -30,7 +30,11 @@
 {
     public const string NAME = 'embed';
 
-    public const array ALLOWED_TAGS = [];
+    public const array ALLOWED_TAGS = [
+        'iframe' => ['src', 'width', 'height'],
+        'figcaption' => [],
+        'figure' => ['id', 'class'],
+    ];
 
     protected function __construct(string $id, string $type, array $data, ?array $tunes = [], ?array $allowedTags = null)
     {
diff --git a/src/Blocks/Header.php b/src/Blocks/Header.php
@@ -52,10 +52,10 @@ protected function __construct(string $id, string $type, array $data, ?array $tu
     #[\Override]
     public function toHtml(): string
     {
+        $tag = "h{$this->data['level']}";
+
         return <<<HTML
-        <h{$this->data['level']} id="{$this->id}">
-            {$this->data['text']}
-        </h{$this->data['level']}>
+        <{$tag} id="{$this->id}">{$this->data['text']}</{$tag}>
         HTML;
     }
 }
diff --git a/src/Blocks/Listing.php b/src/Blocks/Listing.php
@@ -31,9 +31,9 @@
     public const string NAME = 'list';
 
     public const array ALLOWED_TAGS = [
-        'ol' => '*',
-        'ul' => '*',
-        'li' => '*',
+        'ol' => ['id', 'class'],
+        'ul' => ['id', 'class'],
+        'li' => [],
     ];
 
     protected function __construct(string $id, string $type, array $data, ?array $tunes = [], ?array $allowedTags = null)
diff --git a/src/Blocks/Quote.php b/src/Blocks/Quote.php
@@ -31,7 +31,7 @@
     public const string NAME = 'quote';
 
     public const array ALLOWED_TAGS = [
-        'blockquote' => ['id', 'class', 'style'],
+        'blockquote' => ['id', 'class', 'data-align'],
         'footer' => [],
     ];
 
@@ -49,8 +49,16 @@ protected function __construct(string $id, string $type, array $data, ?array $tu
     #[\Override]
     public function toHtml(): string
     {
+        if ($this->data['caption'] == '<br>') {
+            return <<<HTML
+            <blockquote id="{$this->id}" data-align="{$this->data['alignment']}">
+                <p>{$this->data['text']}</p>
+            </blockquote>
+            HTML;
+        }
+
         return <<<HTML
-        <blockquote id="{$this->id}" style="text-align: {$this->data['alignment']}">
+        <blockquote id="{$this->id}" data-align="{$this->data['alignment']}">
             <p>{$this->data['text']}</p>
             <footer>{$this->data['caption']}</footer>
         </blockquote>
diff --git a/src/Definition/AbstractBlock.php b/src/Definition/AbstractBlock.php
@@ -72,7 +72,6 @@ public static function create(array $data, array $allowedTags = []): static
         Assert::notEmpty($data['id']);
         Assert::notEmpty($data['type']);
         Assert::isArray($data['data']);
-        Assert::notEmpty($data['data']);
 
         return new static(
             id: $data['id'],
diff --git a/src/Definition/BlockFactory.php b/src/Definition/BlockFactory.php
@@ -69,6 +69,7 @@ private static function decode(string $data): void
         Assert::keyExists($input, 'blocks');
         Assert::keyExists($input, 'time');
         Assert::keyExists($input, 'version');
+        Assert::allKeyExists($input['blocks'], 'type');
 
         self::$data = $input;
     }
diff --git a/tests/Blocks/AbstractBlockTest.php b/tests/Blocks/AbstractBlockTest.php
@@ -25,8 +25,7 @@ abstract public static function getInvalidSchemasProvider(): Generator;
     public function testBlockParsingWithInvalidSchema(string $data, string $message): void
     {
         $this->expectException(EditorException::class);
-        $editor = new Editor($data);
-        $editor->getHtml();
+        (new Editor($data))->getHtml();
     }
 
     #[DataProvider('getValidSchemasProvider')]
diff --git a/tests/Blocks/CodeTest.php b/tests/Blocks/CodeTest.php
@@ -9,12 +9,83 @@ class CodeTest extends AbstractBlockTest
     #[\Override]
     public static function getValidSchemasProvider(): \Generator
     {
-        yield [];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "code", "data": {"code": "hello world"}}]
+              }
+            JSON,
+            <<<HTML
+            <pre id="zg_WswMy6h">
+                <code>hello world</code>
+            </pre>
+            HTML,
+            'simple code',
+        ];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "code", "data": {"code": "body {\\n font-size: 14px;\\n line-height: 16px;\\n}"}}]
+              }
+            JSON,
+            <<<HTML
+            <pre id="zg_WswMy6h">
+                <code>body {
+             font-size: 14px;
+             line-height: 16px;
+            }</code>
+            </pre>
+            HTML,
+            'multi line code',
+        ];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [
+                        {"id": "zg_WswMy6h", "type": "code", "data": {"code": "hello world"}},
+                        {"id": "zg_WswMy6z", "type": "code", "data": {"code": "hello world"}}
+                   ]
+              }
+            JSON,
+            <<<HTML
+            <pre id="zg_WswMy6h">
+                <code>hello world</code>
+            </pre><pre id="zg_WswMy6z">
+                <code>hello world</code>
+            </pre>
+            HTML,
+            'multiple code',
+        ];
     }
 
     #[\Override]
     public static function getInvalidSchemasProvider(): \Generator
     {
-        yield [];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "code", "data": {}}]
+              }
+            JSON,
+            'invalid code block schema',
+        ];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "code", "data": {"code": {}}}]
+              }
+            JSON,
+            'invalid code data',
+        ];
     }
 }
diff --git a/tests/Blocks/DelimiterTest.php b/tests/Blocks/DelimiterTest.php
@@ -9,12 +9,36 @@ class DelimiterTest extends AbstractBlockTest
     #[\Override]
     public static function getValidSchemasProvider(): \Generator
     {
-        yield [];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "delimiter", "data": {}}]
+              }
+            JSON,
+            <<<HTML
+            <hr id="zg_WswMy6h" />
+            HTML,
+            'simple delimiter',
+        ];
     }
 
     #[\Override]
     public static function getInvalidSchemasProvider(): \Generator
     {
-        yield [];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "delimiter", "data": ""}]
+              }
+            JSON,
+            <<<HTML
+            <hr id="zg_WswMy6h" />
+            HTML,
+            'invalid delimiter data',
+        ];
     }
 }
diff --git a/tests/Blocks/HeaderTest.php b/tests/Blocks/HeaderTest.php
@@ -9,12 +9,79 @@ class HeaderTest extends AbstractBlockTest
     #[\Override]
     public static function getValidSchemasProvider(): \Generator
     {
-        yield [];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "header", "data": {"text":  "hello world", "level":  1}}]
+              }
+            JSON,
+            <<<HTML
+            <h1 id="zg_WswMy6h">hello world</h1>
+            HTML,
+            'simple header',
+        ];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [
+                        {"id": "zg_WswMy6h", "type": "header", "data": {"text":  "hello world", "level":  1}},
+                        {"id": "zg_WswMy6z", "type": "header", "data": {"text":  "hello world", "level":  2}}
+                   ]
+              }
+            JSON,
+            <<<HTML
+            <h1 id="zg_WswMy6h">hello world</h1><h2 id="zg_WswMy6z">hello world</h2>
+            HTML,
+            'multiple headers',
+        ];
     }
 
     #[\Override]
     public static function getInvalidSchemasProvider(): \Generator
     {
-        yield [];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "header", "data": {"text": "hello world", "level":  7}}]
+              }
+            JSON,
+            'invalid header level',
+        ];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "code", "data": {"text":  "hello world"}}]
+              }
+            JSON,
+            'missing header level',
+        ];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "code", "data": {"level":  "hello world"}}]
+              }
+            JSON,
+            'invalid level type and missing text',
+        ];
+        yield [
+            <<<JSON
+              {
+                   "time": 1739980616433,
+                   "version": "2",
+                   "blocks": [{"id": "zg_WswMy6h", "type": "code", "data": {}}]
+              }
+            JSON,
+            'invalid header data',
+        ];
     }
 }
diff --git a/tests/Blocks/ListingTest.php b/tests/Blocks/ListingTest.php
diff --git a/tests/Blocks/QuoteTest.php b/tests/Blocks/QuoteTest.php

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ protected function __construct(string $id, string $type, array $data, ?array $tu`
`36`	`36`	`{`
`37`	`37`	`Assert::eq($type, self::NAME);`
`38`	`38`	`Assert::keyExists($data, 'code');`
	`39`	`+ Assert::string($data['code']);`
`39`	`40`
`40`	`41`	`parent::__construct($id, $type, $data, $tunes, $allowedTags);`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected function __construct(string $id, string $type, array $data, ?array $tu`
`43`	`43`	`public function toHtml(): string`
`44`	`44`	`{`
`45`	`45`	`return <<<HTML`
`46`		`- <hr id="{$this->id}">`
	`46`	`+ <hr id="{$this->id}" />`
`47`	`47`	`HTML;`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,11 @@`
`30`	`30`	`{`
`31`	`31`	`public const string NAME = 'embed';`
`32`	`32`
`33`		`- public const array ALLOWED_TAGS = [];`
	`33`	`+ public const array ALLOWED_TAGS = [`
	`34`	`+ 'iframe' => ['src', 'width', 'height'],`
	`35`	`+ 'figcaption' => [],`
	`36`	`+ 'figure' => ['id', 'class'],`
	`37`	`+ ];`
`34`	`38`
`35`	`39`	`protected function __construct(string $id, string $type, array $data, ?array $tunes = [], ?array $allowedTags = null)`
`36`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,10 @@ protected function __construct(string $id, string $type, array $data, ?array $tu`
`52`	`52`	`#[\Override]`
`53`	`53`	`public function toHtml(): string`
`54`	`54`	`{`
	`55`	`+ $tag = "h{$this->data['level']}";`
	`56`	`+`
`55`	`57`	`return <<<HTML`
`56`		`- <h{$this->data['level']} id="{$this->id}">`
`57`		`- {$this->data['text']}`
`58`		`- </h{$this->data['level']}>`
	`58`	`+ <{$tag} id="{$this->id}">{$this->data['text']}</{$tag}>`
`59`	`59`	`HTML;`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ private static function decode(string $data): void`
`69`	`69`	`Assert::keyExists($input, 'blocks');`
`70`	`70`	`Assert::keyExists($input, 'time');`
`71`	`71`	`Assert::keyExists($input, 'version');`
	`72`	`+ Assert::allKeyExists($input['blocks'], 'type');`
`72`	`73`
`73`	`74`	`self::$data = $input;`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,7 @@ abstract public static function getInvalidSchemasProvider(): Generator;`
`25`	`25`	`public function testBlockParsingWithInvalidSchema(string $data, string $message): void`
`26`	`26`	`{`
`27`	`27`	`$this->expectException(EditorException::class);`
`28`		`- $editor = new Editor($data);`
`29`		`- $editor->getHtml();`
	`28`	`+ (new Editor($data))->getHtml();`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`#[DataProvider('getValidSchemasProvider')]`