[FrameworkBundle] fix merge of 3.3 into 3.4

symfony · nicolas-grekas · Dec 15, 2017 · Dec 15, 2017 · Dec 15, 2017 · 76e16ff4ef5144103835cebdbc06d14df866bfeb
commit 76e16ff4ef5144103835cebdbc06d14df866bfeb
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -141,13 +141,6 @@ public function testEsiDisabled()
        $container = $this->createContainerFromFile('esi_disabled');

        $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'));
    }

@@ -164,6 +157,7 @@ public function testSsiDisabled()
        $container = $this->createContainerFromFile('ssi_disabled');

        $this->assertFalse($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is not registered');
+        $this->assertFalse($container->hasDefinition('ssi'));
    }

    public function testEsiAndSsiWithoutFragments()
@@ -175,14 +169,6 @@ public function testEsiAndSsiWithoutFragments()
        $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()
    {
        $container = $this->createContainerFromFile('profiler');