Simplify mocking assertions. (#40786)

laravel · Feb 3, 2022 · 5164e0e · 5164e0e
1 parent 0a973b1
commit 5164e0e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/tests/Database/DatabaseConnectorTest.php b/tests/Database/DatabaseConnectorTest.php
@@ -129,8 +129,8 @@ public function testPostgresSearchPathCommaSeparatedValueSupported()
         $config = ['host' => 'foo', 'database' => 'bar', 'search_path' => 'public, "user"', 'charset' => 'utf8'];
         $connector = $this->getMockBuilder('Illuminate\Database\Connectors\PostgresConnector')->setMethods(['createConnection', 'getOptions'])->getMock();
         $connection = m::mock('stdClass');
-        $connector->expects($this->once())->method('getOptions')->with($this->equalTo($config))->will($this->returnValue(['options']));
-        $connector->expects($this->once())->method('createConnection')->with($this->equalTo($dsn), $this->equalTo($config), $this->equalTo(['options']))->will($this->returnValue($connection));
+        $connector->expects($this->once())->method('getOptions')->with($this->equalTo($config))->willReturn(['options']);
+        $connector->expects($this->once())->method('createConnection')->with($this->equalTo($dsn), $this->equalTo($config), $this->equalTo(['options']))->willReturn($connection);
         $connection->shouldReceive('prepare')->once()->with('set names \'utf8\'')->andReturn($connection);
         $connection->shouldReceive('prepare')->once()->with('set search_path to "public", "user"')->andReturn($connection);
         $connection->shouldReceive('execute')->twice();
@@ -145,8 +145,8 @@ public function testPostgresSearchPathVariablesSupported()
         $config = ['host' => 'foo', 'database' => 'bar', 'search_path' => '"$user", public, user', 'charset' => 'utf8'];
         $connector = $this->getMockBuilder('Illuminate\Database\Connectors\PostgresConnector')->setMethods(['createConnection', 'getOptions'])->getMock();
         $connection = m::mock('stdClass');
-        $connector->expects($this->once())->method('getOptions')->with($this->equalTo($config))->will($this->returnValue(['options']));
-        $connector->expects($this->once())->method('createConnection')->with($this->equalTo($dsn), $this->equalTo($config), $this->equalTo(['options']))->will($this->returnValue($connection));
+        $connector->expects($this->once())->method('getOptions')->with($this->equalTo($config))->willReturn(['options']);
+        $connector->expects($this->once())->method('createConnection')->with($this->equalTo($dsn), $this->equalTo($config), $this->equalTo(['options']))->willReturn($connection);
         $connection->shouldReceive('prepare')->once()->with('set names \'utf8\'')->andReturn($connection);
         $connection->shouldReceive('prepare')->once()->with('set search_path to "$user", "public", "user"')->andReturn($connection);
         $connection->shouldReceive('execute')->twice();

diff --git a/tests/Foundation/Testing/DatabaseMigrationsTest.php b/tests/Foundation/Testing/DatabaseMigrationsTest.php
@@ -46,7 +46,7 @@ private function __reflectAndSetupAccessibleForProtectedTraitMethod($methodName)
     public function testRefreshTestDatabaseDefault()
     {
         $this->traitObject
-            ->expects($this->exactly(1))
+            ->expects($this->once())
             ->method('artisan')
             ->with('migrate:fresh', [
                 '--drop-views' => false,
@@ -64,7 +64,7 @@ public function testRefreshTestDatabaseWithDropViewsOption()
         $this->traitObject->dropViews = true;
 
         $this->traitObject
-            ->expects($this->exactly(1))
+            ->expects($this->once())
             ->method('artisan')
             ->with('migrate:fresh', [
                 '--drop-views' => true,
@@ -82,7 +82,7 @@ public function testRefreshTestDatabaseWithDropTypesOption()
         $this->traitObject->dropTypes = true;
 
         $this->traitObject
-            ->expects($this->exactly(1))
+            ->expects($this->once())
             ->method('artisan')
             ->with('migrate:fresh', [
                 '--drop-views' => false,

diff --git a/tests/Foundation/Testing/RefreshDatabaseTest.php b/tests/Foundation/Testing/RefreshDatabaseTest.php
@@ -46,7 +46,7 @@ private function __reflectAndSetupAccessibleForProtectedTraitMethod($methodName)
     public function testRefreshTestDatabaseDefault()
     {
         $this->traitObject
-            ->expects($this->exactly(1))
+            ->expects($this->once())
             ->method('artisan')
             ->with('migrate:fresh', [
                 '--drop-views' => false,
@@ -64,7 +64,7 @@ public function testRefreshTestDatabaseWithDropViewsOption()
         $this->traitObject->dropViews = true;
 
         $this->traitObject
-            ->expects($this->exactly(1))
+            ->expects($this->once())
             ->method('artisan')
             ->with('migrate:fresh', [
                 '--drop-views' => true,
@@ -82,7 +82,7 @@ public function testRefreshTestDatabaseWithDropTypesOption()
         $this->traitObject->dropTypes = true;
 
         $this->traitObject
-            ->expects($this->exactly(1))
+            ->expects($this->once())
             ->method('artisan')
             ->with('migrate:fresh', [
                 '--drop-views' => false,

diff --git a/tests/Support/SupportNamespacedItemResolverTest.php b/tests/Support/SupportNamespacedItemResolverTest.php
@@ -30,9 +30,7 @@ public function testParsedItemsAreCached()
     public function testParsedItemsMayBeFlushed()
     {
         $r = $this->getMockBuilder(NamespacedItemResolver::class)->onlyMethods(['parseBasicSegments', 'parseNamespacedSegments'])->getMock();
-        $r->expects($this->once())->method('parseBasicSegments')->will(
-            $this->returnValue(['bar'])
-        );
+        $r->expects($this->once())->method('parseBasicSegments')->willReturn(['bar']);
 
         $r->setParsedKey('foo.bar', ['foo']);
         $r->flushParsedKeys();