Fix the turbo-stream checking

hotwired-laravel · Jan 29, 2021 · 61d19b1 · 61d19b1
1 parent b79a073
commit 61d19b1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/Http/Middleware/TurboMiddleware.php b/src/Http/Middleware/TurboMiddleware.php
@@ -9,6 +9,7 @@
 use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
 use Tonysm\TurboLaravel\NamesResolver;
+use Tonysm\TurboLaravel\Turbo;
 use Tonysm\TurboLaravel\TurboFacade;
 
 class TurboMiddleware
@@ -72,7 +73,7 @@ private function turboResponse($response, Request $request)
      */
     private function turboVisit($request)
     {
-        return Str::contains($request->header('Accept', ''), 'turbo-stream');
+        return Str::contains($request->header('Accept', ''), Turbo::TURBO_STREAM_FORMAT);
     }
 
     /**

diff --git a/src/Models/Broadcasts.php b/src/Models/Broadcasts.php
@@ -6,7 +6,6 @@
 use Tonysm\TurboLaravel\Jobs\BroadcastModelCreated;
 use Tonysm\TurboLaravel\Jobs\BroadcastModelUpdated;
 use Tonysm\TurboLaravel\LaravelBroadcaster;
-use Tonysm\TurboLaravel\NamesResolver;
 use Tonysm\TurboLaravel\TurboFacade;
 
 /**

diff --git a/tests/Http/Middleware/TurboMiddlewareTest.php b/tests/Http/Middleware/TurboMiddlewareTest.php
@@ -9,6 +9,7 @@
 use Tonysm\TurboLaravel\Http\Middleware\TurboMiddleware;
 use Tonysm\TurboLaravel\Tests\TestCase;
 use Tonysm\TurboLaravel\Tests\TestModel;
+use Tonysm\TurboLaravel\Turbo;
 use Tonysm\TurboLaravel\TurboFacade;
 
 class TurboMiddlewareTest extends TestCase
@@ -36,7 +37,7 @@ public function handles_redirect_responses()
     {
         $request = Request::create('/source');
         $request->headers->add([
-            'Accept' => 'text/html; turbo-stream, text/html, application/xhtml+xml',
+            'Accept' => sprintf('%s, text/html, application/xhtml+xml', Turbo::TURBO_STREAM_FORMAT),
         ]);
         $response = new RedirectResponse('/destination');
         $next = function () use ($response) {
@@ -82,7 +83,7 @@ public function respects_the_redirects_to_property_of_the_validation_failed_exce
         $request = Request::create('/test-models', 'POST');
 
         $request->headers->add([
-            'Accept' => 'text/html; turbo-stream, text/html, application/xhtml+xml',
+            'Accept' => sprintf('%s, text/html, application/xhtml+xml', Turbo::TURBO_STREAM_FORMAT),
         ]);
 
         $next = function () {
@@ -115,7 +116,7 @@ public function redirects_back_to_resource_create_routes_on_failed_validation_fo
         })->name('test-models.store')->middleware(TurboMiddleware::class);
 
         $response = $this->from('/source')->post(route('test-models.store'), [], [
-            'Accept' => 'text/html; turbo-stream, text/html, application/xhtml+xml',
+            'Accept' => sprintf('%s, text/html, application/xhtml+xml', Turbo::TURBO_STREAM_FORMAT),
         ]);
 
         $response->assertRedirect(route('test-models.create'));
@@ -136,7 +137,7 @@ public function redirects_back_to_resource_edit_routes_on_failed_validation_foll
         $testModel = TestModel::create(['name' => 'Dummy model']);
 
         $response = $this->from('/source')->put(route('test-models.update', $testModel), [], [
-            'Accept' => 'text/html; turbo-stream, text/html, application/xhtml+xml',
+            'Accept' => sprintf('%s, text/html, application/xhtml+xml', Turbo::TURBO_STREAM_FORMAT),
         ]);
 
         $response->assertRedirect(route('test-models.edit', $testModel));
@@ -153,7 +154,7 @@ public function lets_it_crash_when_redirect_route_does_not_exist()
         $testModel = TestModel::create(['name' => 'Dummy model']);
 
         $response = $this->from('/source')->put(route('test-models.update', $testModel), [], [
-            'Accept' => 'text/html; turbo-stream, text/html, application/xhtml+xml',
+            'Accept' => sprintf('%s, text/html, application/xhtml+xml', Turbo::TURBO_STREAM_FORMAT),
         ]);
 
         $response->assertRedirect('/source');