[FrameworkBundle] fix merge of 3.3 into 3.4

This commit is contained in:
David Maicher 2017-12-15 10:06:19 +01:00
parent 60ddf9ee7a
commit 76e16ff4ef

View File

@ -141,13 +141,6 @@ abstract class FrameworkExtensionTest extends TestCase
$container = $this->createContainerFromFile('esi_disabled'); $container = $this->createContainerFromFile('esi_disabled');
$this->assertFalse($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is not registered'); $this->assertFalse($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is not registered');
}
public function testEsiInactive()
{
$container = $this->createContainerFromFile('default_config');
$this->assertFalse($container->hasDefinition('fragment.renderer.esi'));
$this->assertFalse($container->hasDefinition('esi')); $this->assertFalse($container->hasDefinition('esi'));
} }
@ -164,6 +157,7 @@ abstract class FrameworkExtensionTest extends TestCase
$container = $this->createContainerFromFile('ssi_disabled'); $container = $this->createContainerFromFile('ssi_disabled');
$this->assertFalse($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is not registered'); $this->assertFalse($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is not registered');
$this->assertFalse($container->hasDefinition('ssi'));
} }
public function testEsiAndSsiWithoutFragments() public function testEsiAndSsiWithoutFragments()
@ -175,14 +169,6 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered'); $this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered');
} }
public function testSsiInactive()
{
$container = $this->createContainerFromFile('default_config');
$this->assertFalse($container->hasDefinition('fragment.renderer.ssi'));
$this->assertFalse($container->hasDefinition('ssi'));
}
public function testEnabledProfiler() public function testEnabledProfiler()
{ {
$container = $this->createContainerFromFile('profiler'); $container = $this->createContainerFromFile('profiler');