Fix 404 page title meta output (#268)

Co-authored-by: Jesse Leite <[email protected]>

composer.json

@@ -22,7 +22,7 @@
         }
     },
     "require": {
-        "statamic/cms": "^4.0"
+        "statamic/cms": "^4.1.3"
     },
     "require-dev": {
         "orchestra/testbench": "^7.0 || ^8.0",

src/Cascade.php

@@ -73,7 +73,7 @@ public function get()
             return $this->getForSitemap();
         }
 
-        if (array_get($this->current, 'response_code') === 404) {
+        if (array_get($this->data, 'response_code') === 404) {
             $this->current['title'] = '404 Page Not Found';
         }
 

tests/CascadeTest.php

@@ -164,4 +164,18 @@ public function it_generates_seo_cascade_without_exception_when_no_home_entry_ex
 
         $this->assertArraySubset($expected, $data);
     }
+
+    /** @test */
+    public function it_generates_404_title_with_404_in_response_code_in_context()
+    {
+        $data = (new Cascade)
+            ->with(SiteDefaults::load()->all())
+            ->with([
+                'response_code' => 404,
+            ])
+            ->get();
+
+        $this->assertEquals('404 Page Not Found', $data['title']);
+        $this->assertEquals('404 Page Not Found | Site Name', $data['compiled_title']);
+    }
 }

tests/Fixtures/views/antlers/errors/404.antlers.html

@@ -0,0 +1,2 @@
+<h1>antlers</h1>
+<h2>404!</h2>

tests/Fixtures/views/blade-components/errors/404.blade.php

@@ -0,0 +1,4 @@
+<x-layout>
+    <h1>blade-components</h1>
+    <h2>404!</h2>
+</x-layout>

tests/Fixtures/views/blade/errors/404.blade.php

@@ -0,0 +1,3 @@
+@extends('layout')
+<h1>blade</h1>
+<h2>404!</h2>

tests/MetaTagTest.php

@@ -657,6 +657,25 @@ public function it_generates_search_engine_verification_codes($viewType)
         $response->assertSee('<meta name="msvalidate.01" content="bing123" />', false);
     }
 
+    /**
+     * @test
+     *
+     * @dataProvider viewScenarioProvider
+     */
+    public function it_generates_proper_404_page_title($viewType)
+    {
+        $this->prepareViews($viewType);
+
+        $expected = <<<'EOT'
+<title>404 Page Not Found | Site Name</title>
+EOT;
+
+        $content = $this->get('/non-existent-page')->content();
+        $this->assertStringContainsString("<h1>{$viewType}</h1>", $content);
+        $this->assertStringContainsString('<h2>404!</h2>', $content);
+        $this->assertStringContainsString($this->normalizeMultilineString($expected), $content);
+    }
+
     protected function setCustomGlidePresetDimensions($app)
     {
         $app->config->set('statamic.seo-pro.assets', [