Fix missing view context when using blade layout components (#235)

jesseleite · web-flow · commit 8688a7b67119 · 2022-11-07T18:44:03.000-05:00
diff --git a/src/Directives/SeoProDirective.php b/src/Directives/SeoProDirective.php
@@ -2,12 +2,27 @@
 
 namespace Statamic\SeoPro\Directives;
 
+use Facades\Statamic\View\Cascade;
 use Statamic\SeoPro\Tags\SeoProTags;
 
 class SeoProDirective extends SeoProTags
 {
     public function renderTag($tag, $context)
     {
+        if ($this->isMissingContext($context)) {
+            $context = $this->getContextFromCascade();
+        }
+
         return $this->setContext($context)->$tag();
     }
+
+    protected function isMissingContext($context)
+    {
+        return ! isset($context['current_template']);
+    }
+
+    protected function getContextFromCascade()
+    {
+        return Cascade::instance()->toArray();
+    }
 }
diff --git a/tests/Fixtures/site-localized/content/collections/pages/default/about.md b/tests/Fixtures/site-localized/content/collections/pages/default/about.md
@@ -5,4 +5,4 @@ updated_at: 1579284102
 template: page
 id: 62136fa2-9e5c-4c38-a894-a2753f02f5ff
 ---
-I'm just a kid living in the 90's, writing articles in his secret public journal wonder if someday, somewhere in the future, they will be read by someone.
+I'm just a kid living in the 90's, writing articles in his secret public journal wonder if someday, somewhere in the future, they will be read by someone.
diff --git a/tests/Fixtures/site-localized/content/collections/pages/default/articles.md b/tests/Fixtures/site-localized/content/collections/pages/default/articles.md
@@ -1,8 +1,8 @@
 ---
 title: Articles
-template: articles.index
+template: page
 updated_by: 96300192-873c-4615-b992-157508a8d7c5
 updated_at: 1579283552
 id: b9e4bfe3-9c12-4553-b7ef-f43c22ffaa63
 ---
-These are my various writings. Some might say they are cool.
+These are my various writings. Some might say they are cool.
diff --git a/tests/Fixtures/site-localized/content/collections/pages/default/home.md b/tests/Fixtures/site-localized/content/collections/pages/default/home.md
@@ -1,6 +1,6 @@
 ---
 title: Home
-template: home
+template: page
 subtitle: 'I see pride. I see power.'
 updated_by: b6c037ad-5bcc-41a8-a455-9ab54573f689
 updated_at: 1606223924
diff --git a/tests/Fixtures/site/content/collections/pages/home.md b/tests/Fixtures/site/content/collections/pages/home.md
@@ -1,9 +1,9 @@
 ---
 title: Home
-template: home
+template: page
 subtitle: 'I see pride. I see power.'
 updated_by: b6c037ad-5bcc-41a8-a455-9ab54573f689
 updated_at: 1606223924
 id: home
 ---
-I see a bad-ass mother.
+I see a bad-ass mother.
diff --git a/tests/Fixtures/site/content/taxonomies/topics/sneakers.yaml b/tests/Fixtures/site/content/taxonomies/topics/sneakers.yaml
@@ -1,3 +1,4 @@
 title: Sneakers
+template: page
 updated_by: 96300192-873c-4615-b992-157508a8d7c5
 updated_at: 1579284942
diff --git a/tests/Fixtures/views/antlers/layout.antlers.html b/tests/Fixtures/views/antlers/layout.antlers.html
@@ -0,0 +1 @@
+{{ template_content }}
diff --git a/tests/Fixtures/views/antlers/page.antlers.html b/tests/Fixtures/views/antlers/page.antlers.html
@@ -0,0 +1,2 @@
+{{ seo_pro:meta }}
+<h1>antlers</h1>
diff --git a/tests/Fixtures/views/blade-components/components/layout.blade.php b/tests/Fixtures/views/blade-components/components/layout.blade.php
@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+    <head>
+        @seo_pro('meta')
+    </head>
+    <body>
+        {{ $slot }}
+    </body>
+</html>
diff --git a/tests/Fixtures/views/blade-components/page.blade.php b/tests/Fixtures/views/blade-components/page.blade.php
@@ -0,0 +1,3 @@
+<x-layout>
+    <h1>blade-components</h1>
+</x-layout>
diff --git a/tests/Fixtures/views/blade/layout.blade.php b/tests/Fixtures/views/blade/layout.blade.php
@@ -0,0 +1,2 @@
+@seo_pro('meta')
+@yield('content')
diff --git a/tests/Fixtures/views/blade/page.blade.php b/tests/Fixtures/views/blade/page.blade.php
@@ -0,0 +1,2 @@
+@extends('layout')
+<h1>blade</h1>
diff --git a/tests/Localized/MetaTagTest.php b/tests/Localized/MetaTagTest.php
@@ -3,18 +3,38 @@
 namespace Tests\Localized;
 
 use Statamic\Facades\Config;
-use Tests\MetaProviders;
+use Tests\TestCase;
+use Tests\ViewScenarios;
 
 class MetaTagTest extends TestCase
 {
-    use MetaProviders;
+    use ViewScenarios;
+
+    protected $siteFixturePath = __DIR__.'/../Fixtures/site-localized';
+
+    protected function getEnvironmentSetUp($app)
+    {
+        parent::getEnvironmentSetUp($app);
+
+        $app['config']->set('view.paths', [$this->viewsPath()]);
+        $app['config']->set('statamic.editions.pro', true);
+    }
+
+    public function tearDown(): void
+    {
+        $this->cleanUpViews();
+
+        parent::tearDown();
+    }
 
     /**
      * @test
-     * @dataProvider metaProvider
+     * @dataProvider viewScenarioProvider
      */
-    public function it_generates_multisite_meta($metaProvider)
+    public function it_generates_multisite_meta($viewType)
     {
+        $this->prepareViews($viewType);
+
         $expectedOgLocaleMeta = <<<'EOT'
 <meta property="og:locale" content="en_US" />
 <meta property="og:locale:alternate" content="fr_FR" />
@@ -27,18 +47,20 @@ public function it_generates_multisite_meta($metaProvider)
 <link rel="alternate" href="http://cool-runnings.com/it" hreflang="it" />
 EOT;
 
-        $meta = $this->{$metaProvider}();
-
-        $this->assertStringContainsString($expectedOgLocaleMeta, $meta);
-        $this->assertStringContainsString($expectedAlternateHreflangMeta, $meta);
+        $response = $this->get('/');
+        $response->assertSee("<h1>{$viewType}</h1>", false);
+        $response->assertSee($this->normalizeMultilineString($expectedOgLocaleMeta), false);
+        $response->assertSee($this->normalizeMultilineString($expectedAlternateHreflangMeta), false);
     }
 
     /**
      * @test
-     * @dataProvider metaProvider
+     * @dataProvider viewScenarioProvider
      */
-    public function it_generates_multisite_meta_for_non_home_page_route($metaProvider)
+    public function it_generates_multisite_meta_for_non_home_page_route($viewType)
     {
+        $this->prepareViews($viewType);
+
         $expectedOgLocaleMeta = <<<'EOT'
 <meta property="og:locale" content="en_US" />
 <meta property="og:locale:alternate" content="fr_FR" />
@@ -51,48 +73,54 @@ public function it_generates_multisite_meta_for_non_home_page_route($metaProvide
 <link rel="alternate" href="http://cool-runnings.com/it/about" hreflang="it" />
 EOT;
 
-        $meta = $this->{$metaProvider}('about');
-
-        $this->assertStringContainsString($expectedOgLocaleMeta, $meta);
-        $this->assertStringContainsString($expectedAlternateHreflangMeta, $meta);
+        $response = $this->get('/about');
+        $response->assertSee("<h1>{$viewType}</h1>", false);
+        $response->assertSee($this->normalizeMultilineString($expectedOgLocaleMeta), false);
+        $response->assertSee($this->normalizeMultilineString($expectedAlternateHreflangMeta), false);
     }
 
     /**
      * @test
-     * @dataProvider metaProvider
+     * @dataProvider viewScenarioProvider
      */
-    public function it_doesnt_generate_multisite_meta_when_it_doesnt_exist_for_page($metaProvider)
+    public function it_doesnt_generate_multisite_meta_when_it_doesnt_exist_for_page($viewType)
     {
-        $meta = $this->{$metaProvider}('articles');
+        $this->prepareViews($viewType);
 
-        $this->assertStringContainsString('og:locale', $meta);
-        $this->assertStringNotContainsString('og:locale:alternate', $meta);
-        $this->assertStringNotContainsString('hreflang', $meta);
+        $response = $this->get('/articles');
+        $response->assertSee("<h1>{$viewType}</h1>", false);
+        $response->assertSee('og:locale', false);
+        $response->assertDontSee('og:locale:alternate', false);
+        $response->assertDontSee('hreflang', false);
     }
 
     /**
      * @test
-     * @dataProvider metaProvider
+     * @dataProvider viewScenarioProvider
      */
-    public function it_doesnt_generate_multisite_meta_when_alternate_locales_are_disabled($metaProvider)
+    public function it_doesnt_generate_multisite_meta_when_alternate_locales_are_disabled($viewType)
     {
         Config::set('statamic.seo-pro.alternate_locales', false);
 
-        $meta = $this->{$metaProvider}();
+        $this->prepareViews($viewType);
 
-        $this->assertStringContainsString('og:locale', $meta);
-        $this->assertStringNotContainsString('og:locale:alternate', $meta);
-        $this->assertStringNotContainsString('hreflang', $meta);
+        $response = $this->get('/');
+        $response->assertSee("<h1>{$viewType}</h1>", false);
+        $response->assertSee('og:locale', false);
+        $response->assertDontSee('og:locale:alternate', false);
+        $response->assertDontSee('hreflang', false);
     }
 
     /**
      * @test
-     * @dataProvider metaProvider
+     * @dataProvider viewScenarioProvider
      */
-    public function it_doesnt_generate_multisite_meta_for_excluded_sites($metaProvider)
+    public function it_doesnt_generate_multisite_meta_for_excluded_sites($viewType)
     {
         Config::set('statamic.seo-pro.alternate_locales.excluded_sites', ['french']);
 
+        $this->prepareViews($viewType);
+
         $expectedOgLocaleMeta = <<<'EOT'
 <meta property="og:locale" content="en_US" />
 <meta property="og:locale:alternate" content="it_IT" />
@@ -103,11 +131,11 @@ public function it_doesnt_generate_multisite_meta_for_excluded_sites($metaProvid
 <link rel="alternate" href="http://cool-runnings.com/it" hreflang="it" />
 EOT;
 
-        $meta = $this->{$metaProvider}();
-
-        $this->assertStringContainsString($expectedOgLocaleMeta, $meta);
-        $this->assertStringContainsString($expectedAlternateHreflangMeta, $meta);
-        $this->assertStringNotContainsString('content="fr_FR"', $meta);
-        $this->assertStringNotContainsString('hreflang="fr"', $meta);
+        $response = $this->get('/');
+        $response->assertSee("<h1>{$viewType}</h1>", false);
+        $response->assertSee($this->normalizeMultilineString($expectedOgLocaleMeta), false);
+        $response->assertSee($this->normalizeMultilineString($expectedAlternateHreflangMeta), false);
+        $response->assertDontSee('content="fr_FR"', false);
+        $response->assertDontSee('hreflang="fr"', false);
     }
 }
diff --git a/tests/Localized/TestCase.php b/tests/Localized/TestCase.php
diff --git a/tests/MetaProviders.php b/tests/MetaProviders.php
diff --git a/tests/MetaTagTest.php b/tests/MetaTagTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php
diff --git a/tests/ViewScenarios.php b/tests/ViewScenarios.php

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+{{ seo_pro:meta }}`
	`2`	`+<h1>antlers</h1>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<x-layout>`
	`2`	`+ <h1>blade-components</h1>`
	`3`	`+</x-layout>`