Flash messages don't persist between redirects (#9)

* Flash messages don't persist between redirects

* Add missing APP_KEY to phpunit.xml.dist

NOTE: This is a DUMMY key, and it is meant to be publicly visible.

Author: claudiodekker

phpunit.xml.dist

@@ -19,4 +19,7 @@
             <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
+    <php>
+        <env name="APP_KEY" value="base64:Mwpn3kifqM6BgB/Te+Qing0MIgBMR2PbWVHyEl2cnUg="/>
+    </php>
 </phpunit>

src/FlashMessage.php

@@ -28,7 +28,7 @@ public static function levels(): array
      */
     public static function set(string $level, string $message): void
     {
-        session()->flash('flash_message', [
+        session()->put('flash_message', [
             'message' => $message,
             'level' => $level,
         ]);

src/views/alert.blade.php

@@ -7,4 +7,5 @@
     ])->get(session('flash_message.level', 'success')) }} rounded shadow-inner text-white p-4">
         <p class="text-sm">{{ session('flash_message.message', session('status')) }}</p>
     </div>
+    @php(session()->forget('flash_message'));
 @endif

tests/Feature/ViewFlashMessageTest.php

@@ -3,6 +3,7 @@
 namespace Ubient\FlashMessage\Tests\Feature;
 
 use Ubient\FlashMessage\Tests\TestCase;
+use PHPUnit\Framework\ExpectationFailedException;
 
 /**
  * @SuppressWarnings(PHPMD.CamelCaseMethodName)
@@ -19,8 +20,10 @@ public function setUp()
     {
         parent::setUp();
 
-        app('router')->get('display', function () {
-            return view('flash-message::alert');
+        app('router')->group(['middleware' => 'web'], function ($router) {
+            $router->get('display', function () {
+                return view('flash-message::alert');
+            });
         });
     }
 
@@ -114,4 +117,36 @@ public function it_should_display_nothing_when_no_message_was_flashed(): void
         $response->assertViewIs('flash-message::alert');
         $this->assertEmpty($response->content());
     }
+
+    /** @test */
+    public function it_should_persist_across_multiple_redirects(): void
+    {
+        $message = 'Those who do not remember the past are condemned to repeat it.';
+        app('router')->group(['middleware' => 'web'], function ($router) use ($message) {
+            $router->get('redirect-to-display', function () {
+                return redirect('display');
+            });
+            $router->get('initial', function () use ($message) {
+                return redirect('redirect-to-display')->withInfoMessage($message);
+            });
+        });
+
+        $this->get('initial');
+        $response = $this->get('redirect-to-display');
+
+        $response->assertHasInfoMessage($message);
+    }
+
+    /** @test */
+    public function it_should_only_be_displayed_once(): void
+    {
+        $message = 'If you want to kill any idea in the world, get a committee working on it.';
+
+        redirect('display')->withInfoMessage($message);
+        $this->get('display');
+        $response = $this->get('display');
+
+        $this->expectException(ExpectationFailedException::class);
+        $response->assertHasInfoMessage($message);
+    }
 }

tests/Unit/FlashMessageTest.php

@@ -38,6 +38,5 @@ public function has_a_set_method(): void
 
         $this->assertEquals($flashData, session()->get('flash_message'));
         $this->assertEquals($flashData, session()->get('flash_message'));
-        $this->assertEquals('flash_message', session()->get('_flash.new.0'));
     }
 }