Fix tests

dunglas · dunglas · commit 8f1e7087b4df · 2017-01-31T23:34:09.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -15,6 +15,7 @@
 use Symfony\Bundle\FullStack;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
+use Symfony\Component\Asset\EventListener\PreloadListener;
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Cache\Adapter\ChainAdapter;
 use Symfony\Component\Cache\Adapter\DoctrineAdapter;
@@ -363,8 +364,6 @@ public function testAssets()
 
         $package = $container->getDefinition((string) $packages['bar_version_strategy']);
         $this->assertEquals('assets.custom_version_strategy', (string) $package->getArgument(1));
-
-        $this->assertTrue($container->hasDefinition('asset.preload_listener'));
     }
 
     public function testAssetsDefaultVersionStrategyAsService()
@@ -377,6 +376,16 @@ public function testAssetsDefaultVersionStrategyAsService()
         $this->assertEquals('assets.custom_version_strategy', (string) $defaultPackage->getArgument(1));
     }
 
+    public function testAssetHasPreloadListener()
+    {
+        if (!class_exists(PreloadListener::class)) {
+            $this->markTestSkipped('Requires asset 3.3 or superior.');
+        }
+
+        $container = $this->createContainerFromFile('assets');
+        $this->assertTrue($container->hasDefinition('asset.preload_listener'));
+    }
+
     public function testTranslator()
     {
         $container = $this->createContainerFromFile('full');
diff --git a/src/Symfony/Component/Asset/Tests/EventListener/PreloadListenerTest.php b/src/Symfony/Component/Asset/Tests/EventListener/PreloadListenerTest.php
@@ -29,7 +29,7 @@ public function testOnKernelResponse()
         $listener = new PreloadListener($manager);
         $response = new Response();
 
-        $event = $this->createMock(FilterResponseEvent::class);
+        $event = $this->getMockBuilder(FilterResponseEvent::class)->disableOriginalConstructor()->getMock();
         $event->method('getResponse')->willReturn($response);
 
         $listener->onKernelResponse($event);
diff --git a/src/Symfony/Component/Asset/Tests/PackageTest.php b/src/Symfony/Component/Asset/Tests/PackageTest.php
@@ -55,7 +55,7 @@ public function testGetVersion()
 
     public function testGetAndPreloadUrl()
     {
-        $preloadManager = $this->createMock(PreloadManagerInterface::class);
+        $preloadManager = $this->getMockBuilder(PreloadManagerInterface::class)->getMock();
         $preloadManager
             ->expects($this->exactly(2))
             ->method('addResource')
diff --git a/src/Symfony/Component/Asset/Tests/PackagesTest.php b/src/Symfony/Component/Asset/Tests/PackagesTest.php
@@ -58,7 +58,7 @@ public function testGetUrl()
 
     public function testGetAndPreloadUrl()
     {
-        $preloadManager = $this->createMock(PreloadManagerInterface::class);
+        $preloadManager = $this->getMockBuilder(PreloadManagerInterface::class)->getMock();
         $preloadManager
             ->expects($this->exactly(2))
             ->method('addResource')
@@ -100,7 +100,7 @@ public function testUndefinedPackage()
      */
     public function testDoesNotSupportPreloading()
     {
-        $packages = new Packages($this->createMock(PackageInterface::class));
+        $packages = new Packages($this->getMockBuilder(PackageInterface::class)->getMock());
         $packages->getAndPreloadUrl('/foo');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function testGetVersion()`
`55`	`55`
`56`	`56`	`public function testGetAndPreloadUrl()`
`57`	`57`	`{`
`58`		`- $preloadManager = $this->createMock(PreloadManagerInterface::class);`
	`58`	`+ $preloadManager = $this->getMockBuilder(PreloadManagerInterface::class)->getMock();`
`59`	`59`	`$preloadManager`
`60`	`60`	`->expects($this->exactly(2))`
`61`	`61`	`->method('addResource')`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function testGetUrl()`
`58`	`58`
`59`	`59`	`public function testGetAndPreloadUrl()`
`60`	`60`	`{`
`61`		`- $preloadManager = $this->createMock(PreloadManagerInterface::class);`
	`61`	`+ $preloadManager = $this->getMockBuilder(PreloadManagerInterface::class)->getMock();`
`62`	`62`	`$preloadManager`
`63`	`63`	`->expects($this->exactly(2))`
`64`	`64`	`->method('addResource')`
`@@ -100,7 +100,7 @@ public function testUndefinedPackage()`
`100`	`100`	`*/`
`101`	`101`	`public function testDoesNotSupportPreloading()`
`102`	`102`	`{`
`103`		`- $packages = new Packages($this->createMock(PackageInterface::class));`
	`103`	`+ $packages = new Packages($this->getMockBuilder(PackageInterface::class)->getMock());`
`104`	`104`	`$packages->getAndPreloadUrl('/foo');`
`105`	`105`	`}`
`106`	`106`	`}`