From 33e5c34f551cbde69a9eedff37145bb2506e5081 Mon Sep 17 00:00:00 2001
From: Nico Stapelbroek <nstapelbroek@gmail.com>
Date: Mon, 2 Jul 2018 11:29:22 +0200
Subject: [PATCH] Fix metaseo tests after updating to Laravel 5.6

---
 resources/views/layout/master.blade.php   | 2 +-
 tests/Functional/Incident/MetaSeoTest.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
index d94267e6..c63ff42e 100644
--- a/resources/views/layout/master.blade.php
+++ b/resources/views/layout/master.blade.php
@@ -18,7 +18,7 @@
     <meta name="description" content="@yield('description', trans('cachet.meta.description.overview', ['app' => $appName]))">
 
     <meta property="og:type" content="website">
-    <meta property="og:title" content="@yield('title', $site_title)">
+    <meta property="og:title" content="@yield('title', $siteTitle)">
     <meta property="og:image" content="/img/favicon.png">
     <meta property="og:description" content="@yield('description', trans('cachet.meta.description.overview', ['app' => $appName]))">
 
diff --git a/tests/Functional/Incident/MetaSeoTest.php b/tests/Functional/Incident/MetaSeoTest.php
index c1ea4761..f61742b4 100644
--- a/tests/Functional/Incident/MetaSeoTest.php
+++ b/tests/Functional/Incident/MetaSeoTest.php
@@ -71,7 +71,7 @@ class MetaSeoTest extends AbstractTestCase
         $expectedDescription = htmlspecialchars($this->fakerFactory->sentence);
 
         $incident = $this->createIncidentWithMeta(['seo' => ['description' => $expectedDescription]]);
-        $page = $this->get(sprintf('/incidents/%d', $incident->id))->response;
+        $page = $this->get(sprintf('/incidents/%d', $incident->id));
 
         $this->assertContains(
             sprintf('<meta property="og:description" content="%s">', $expectedDescription),
@@ -92,7 +92,7 @@ class MetaSeoTest extends AbstractTestCase
         $title = htmlspecialchars($this->fakerFactory->title);
 
         $incident = $this->createIncidentWithMeta(['seo' => ['title' => $title]]);
-        $page = $this->get(sprintf('/incidents/%d', $incident->id))->response;
+        $page = $this->get(sprintf('/incidents/%d', $incident->id));
 
         $this->assertContains(
             sprintf('<meta property="og:title" content="%s | %s">', $title, $this->appName),
@@ -120,7 +120,7 @@ class MetaSeoTest extends AbstractTestCase
             $presenter->occurred_at_formatted
         );
 
-        $page = $this->get(sprintf('/incidents/%d', $incident->id))->response;
+        $page = $this->get(sprintf('/incidents/%d', $incident->id));
 
         $this->assertContains(
             sprintf('<meta property="og:description" content="%s">', $expectedDescription),
@@ -141,7 +141,7 @@ class MetaSeoTest extends AbstractTestCase
         $incident = $this->createIncidentWithMeta([]);
         $expectedTitle = sprintf('%s | %s', htmlspecialchars($incident->name), $this->appName);
 
-        $page = $this->get(sprintf('/incidents/%d', $incident->id))->response;
+        $page = $this->get(sprintf('/incidents/%d', $incident->id));
 
         $this->assertContains(
             sprintf('<meta property="og:title" content="%s">', $expectedTitle),