Merge branch '3.8'

orchestral · Mar 28, 2019 · e09600a · e09600a
2 parents 5dbf10a + b8c50ff
commit e09600a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Orchestra\\Messages\\TestCase\\" : "tests/"
+            "Orchestra\\Messages\\Tests\\" : "tests/"
         }
     },
     "require": {

diff --git a/tests/Feature/Http/Middleware/StoreMessageBagTest.php b/tests/Feature/Http/Middleware/StoreMessageBagTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Orchestra\Messages\TestCase\Feature\Http\Middleware;
+namespace Orchestra\Messages\Tests\Feature\Http\Middleware;
 
 use Mockery as m;
 use Illuminate\Http\Request;

diff --git a/tests/Feature/MessageBagTest.php b/tests/Feature/MessageBagTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Orchestra\Messages\TestCase\Feature;
+namespace Orchestra\Messages\Tests\Feature;
 
 use Mockery as m;
 use Orchestra\Support\Facades\Messages;
@@ -29,6 +29,7 @@ public function it_can_flash_empty_message_to_session()
         $session->shouldReceive('flash')->once()->andReturn(true);
 
         $this->assertNull(Messages::setSessionStore($session)->save());
+        $this->assertSame($session, Messages::getSessionStore());
     }
 
     /** @test */
@@ -49,6 +50,7 @@ public function it_can_store_messages_to_session()
         $this->assertStringContainsString('Hi World', $serialize);
         $this->assertStringContainsString('bye', $serialize);
         $this->assertStringContainsString('Goodbye', $serialize);
+        $this->assertSame($session, Messages::getSessionStore());
 
         Messages::save();
     }
@@ -64,6 +66,7 @@ public function it_can_retrieve_message_from_session()
         $retrieve = Messages::setSessionStore($session)->retrieve();
         $retrieve->setFormat();
 
+        $this->assertSame($session, Messages::getSessionStore());
         $this->assertInstanceOf('\Orchestra\Messages\MessageBag', $retrieve);
         $this->assertEquals(['Hi World'], $retrieve->get('hello'));
         $this->assertEquals(['Goodbye'], $retrieve->get('bye'));
@@ -87,6 +90,7 @@ public function it_can_extend_messages_to_current_request()
         $retrieve = $stub->retrieve();
         $retrieve->setFormat();
 
+        $this->assertSame($session, Messages::getSessionStore());
         $this->assertInstanceOf('\Orchestra\Messages\MessageBag', $output);
         $this->assertInstanceOf('\Orchestra\Messages\MessageBag', $retrieve);
         $this->assertEquals(['Hi World', 'Hi Orchestra Platform'], $retrieve->get('hello'));

diff --git a/tests/Feature/MessagesServiceProviderTest.php b/tests/Feature/MessagesServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Orchestra\Messages\TestCase\Feature;
+namespace Orchestra\Messages\Tests\Feature;
 
 class MessagesServiceProviderTest extends TestCase
 {

diff --git a/tests/Feature/TestCase.php b/tests/Feature/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Orchestra\Messages\TestCase\Feature;
+namespace Orchestra\Messages\Tests\Feature;
 
 use Orchestra\Testbench\TestCase as Testbench;