Merge branch 'feature/fix-middleware-response' into develop

Author: mikebronner

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Change Log
+## [0.6.12] - 5 Aug 2018
+### Fixed
+- middleware response to be a view instead of string. Thanks @dallincoons, #96 #95.
+
 ## [0.6.11] - 13 May 2018
 ### Fixed
 - regexp to be simpler. Thanks @juandi, #92.

src/Http/Middleware/LaravelCaffeineDripMiddleware.php

@@ -47,7 +47,9 @@ public function handle(Request $request, Closure $next)
             "{$dripper->html}</body>",
             $content
         );
+        $original = $response->original;
         $response->setContent($content);
+        $response->original = $original;
 
         return $response;
     }

tests/Feature/CaffeineTest.php

@@ -21,6 +21,7 @@ public function testMiddlewareInjectsDripScript()
         $response = $this->get(route('genealabs-laravel-caffeine.tests.form'));
 
         $response->see($expectedResult);
+        $response->assertViewHas('foo');
     }
 
     public function testSuccessfulDrip()

tests/Http/Controllers/Test.php

@@ -10,7 +10,7 @@ public function drippedForm() : View
         config()->set('session.lifetime', 1);
         config()->set('genealabs-laravel-caffeine.drip-interval', 50000);
 
-        return view('genealabs-laravel-caffeine::tests.form');
+        return view('genealabs-laravel-caffeine::tests.form')->with('foo');
     }
 
     public function disabledPage() : View