WIP

ralphjsmit · Jun 15, 2024 · e1ace45 · e1ace45
1 parent 389e9ed
commit e1ace45
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 32 deletions.
diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
diff --git a/src/Support/AlternateTag.php b/src/Support/AlternateTag.php
@@ -9,6 +9,7 @@ public function __construct(
         string $href,
     ) {
         parent::__construct('alternate', $href);
+
         $this->attributes['hreflang'] = $hreflang;
     }
 }
diff --git a/src/Support/SchemaTagCollection.php b/src/Support/SchemaTagCollection.php
@@ -21,9 +21,7 @@ public static function initialize(?SEOData $SEOData = null): ?static
         $collection = new static();
 
         foreach ($schemas as $schema) {
-            $collection->push(
-                new CustomSchema(value($schema, $SEOData))
-            );
+            $collection->push(new CustomSchema(value($schema, $SEOData)));
         }
 
         foreach ($schemas->markup as $markupClass => $markupBuilders) {

diff --git a/src/Support/Tag.php b/src/Support/Tag.php
@@ -7,9 +7,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\HtmlString;
 
-/**
- * A representation of a HTML tag
- */
 abstract class Tag implements Renderable
 {
     const ATTRIBUTES_ORDER = ['rel', 'hreflang', 'title', 'name', 'href', 'property', 'description', 'content'];

diff --git a/tests/Feature/JSON-LD/SchemaCollectionTest.php b/tests/Feature/JSON-LD/SchemaCollectionTest.php
@@ -13,7 +13,26 @@
 it('can correctly render a custom JSON-LD Schemas markup', function () {
     $page = Page::create([]);
 
-    $faqPageSchema = $this->faqTestSchema;
+    $faqPageSchema = [
+        '@context' => 'https://schema.org',
+        '@type' => 'FAQPage',
+        'mainEntity' => [
+            '@type' => 'Question',
+            'name' => 'Can this package add FaqPage to the schema?',
+            'acceptedAnswer' => [
+                '@type' => 'Answer',
+                'text' => 'Yes!',
+            ],
+        ],
+        [
+            '@type' => 'Question',
+            'name' => 'Does it support multiple questions?',
+            'acceptedAnswer' => [
+                '@type' => 'Answer',
+                'text' => 'Of course.',
+            ],
+        ],
+    ];
 
     $page::$overrides = [
         'schema' => SchemaCollection::make()->add($faqPageSchema),
@@ -246,7 +265,26 @@
 it('can correctly render multiple custom JSON-LD Schemas markup', function () {
     $page = Page::create([]);
 
-    $faqPageSchema = $this->faqTestSchema;
+    $faqPageSchema = [
+        '@context' => 'https://schema.org',
+        '@type' => 'FAQPage',
+        'mainEntity' => [
+            '@type' => 'Question',
+            'name' => 'Can this package add FaqPage to the schema?',
+            'acceptedAnswer' => [
+                '@type' => 'Answer',
+                'text' => 'Yes!',
+            ],
+        ],
+        [
+            '@type' => 'Question',
+            'name' => 'Does it support multiple questions?',
+            'acceptedAnswer' => [
+                '@type' => 'Answer',
+                'text' => 'Of course.',
+            ],
+        ],
+    ];
 
     $now = now();
     $yesterday = now()->yesterday();

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -9,27 +9,6 @@
 
 class TestCase extends Orchestra
 {
-    public array $faqTestSchema = [
-        '@context' => 'https://schema.org',
-        '@type' => 'FAQPage',
-        'mainEntity' => [
-            '@type' => 'Question',
-            'name' => 'Can this package add FaqPage to the schema?',
-            'acceptedAnswer' => [
-                '@type' => 'Answer',
-                'text' => 'Yes!',
-            ],
-        ],
-        [
-            '@type' => 'Question',
-            'name' => 'Does it support multiple questions?',
-            'acceptedAnswer' => [
-                '@type' => 'Answer',
-                'text' => 'Of course.',
-            ],
-        ],
-    ];
-
     protected function setUp(): void
     {
         parent::setUp();

diff --git a/tests/Unit/Schema/CustomSchemaTest.php b/tests/Unit/Schema/CustomSchemaTest.php
@@ -3,10 +3,48 @@
 use RalphJSmit\Laravel\SEO\Schema\CustomSchema;
 
 it('can construct a custom faq schema', function () {
-    $schema = new CustomSchema($this->faqTestSchema);
+    $schema = new CustomSchema([
+        '@context' => 'https://schema.org',
+        '@type' => 'FAQPage',
+        'mainEntity' => [
+            '@type' => 'Question',
+            'name' => 'Can this package add FaqPage to the schema?',
+            'acceptedAnswer' => [
+                '@type' => 'Answer',
+                'text' => 'Yes!',
+            ],
+        ],
+        [
+            '@type' => 'Question',
+            'name' => 'Does it support multiple questions?',
+            'acceptedAnswer' => [
+                '@type' => 'Answer',
+                'text' => 'Of course.',
+            ],
+        ],
+    ]);
 
     expect((string) $schema->render())
         ->toBe(
-            '<script type="application/ld+json">' . json_encode($this->faqTestSchema) . '</script>'
+            '<script type="application/ld+json">' . json_encode([
+                '@context' => 'https://schema.org',
+                '@type' => 'FAQPage',
+                'mainEntity' => [
+                    '@type' => 'Question',
+                    'name' => 'Can this package add FaqPage to the schema?',
+                    'acceptedAnswer' => [
+                        '@type' => 'Answer',
+                        'text' => 'Yes!',
+                    ],
+                ],
+                [
+                    '@type' => 'Question',
+                    'name' => 'Does it support multiple questions?',
+                    'acceptedAnswer' => [
+                        '@type' => 'Answer',
+                        'text' => 'Of course.',
+                    ],
+                ],
+            ]) . '</script>'
         );
 });