Return instance of spy when swapping facade for a Mockery spy

laravel · Jul 21, 2018 · 0878503 · 0878503
1 parent 3bf6296
commit 0878503
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Illuminate/Support/Facades/Facade.php b/src/Illuminate/Support/Facades/Facade.php
@@ -25,14 +25,18 @@ abstract class Facade
     /**
      * Convert the facade into a Mockery spy.
      *
-     * @return void
+     * @return MockInterface
      */
     public static function spy()
     {
         if (! static::isMock()) {
             $class = static::getMockableClass();
 
-            static::swap($class ? Mockery::spy($class) : Mockery::spy());
+            $spy = $class ? Mockery::spy($class) : Mockery::spy();
+
+            static::swap($spy);
+
+            return $spy;
         }
     }
 

diff --git a/tests/Support/SupportFacadeTest.php b/tests/Support/SupportFacadeTest.php
@@ -39,6 +39,18 @@ public function testShouldReceiveReturnsAMockeryMock()
         $this->assertEquals('baz', $app['foo']->foo('bar'));
     }
 
+    public function testSpyReturnsAMockerySpy()
+    {
+        $app = new ApplicationStub;
+        $app->setAttributes(['foo' => new stdClass]);
+        FacadeStub::setFacadeApplication($app);
+
+        $this->assertInstanceOf(m\MockInterface::class, $spy = FacadeStub::spy());
+
+        FacadeStub::foo();
+        $spy->shouldHaveReceived('foo');
+    }
+
     public function testShouldReceiveCanBeCalledTwice()
     {
         $app = new ApplicationStub;