Fixed test and fixture
This commit is contained in:
parent
3be0923d25
commit
92e8799d76
@ -47,6 +47,9 @@ $container->loadFromExtension('framework', array(
|
|||||||
),
|
),
|
||||||
'hinclude_default_template' => 'global_hinclude_template',
|
'hinclude_default_template' => 'global_hinclude_template',
|
||||||
),
|
),
|
||||||
|
'assets' => array(
|
||||||
|
'version' => 'v1',
|
||||||
|
),
|
||||||
'translator' => array(
|
'translator' => array(
|
||||||
'enabled' => true,
|
'enabled' => true,
|
||||||
'fallback' => 'fr',
|
'fallback' => 'fr',
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
<framework:resource>theme2</framework:resource>
|
<framework:resource>theme2</framework:resource>
|
||||||
</framework:form>
|
</framework:form>
|
||||||
</framework:templating>
|
</framework:templating>
|
||||||
|
<framework:assets version="v1" />
|
||||||
<framework:translator enabled="true" fallback="fr" logging="true" />
|
<framework:translator enabled="true" fallback="fr" logging="true" />
|
||||||
<framework:validation enabled="true" cache="apc" />
|
<framework:validation enabled="true" cache="apc" />
|
||||||
<framework:annotations cache="file" debug="true" file-cache-dir="%kernel.cache_dir%/annotations" />
|
<framework:annotations cache="file" debug="true" file-cache-dir="%kernel.cache_dir%/annotations" />
|
||||||
|
@ -36,6 +36,8 @@ framework:
|
|||||||
form:
|
form:
|
||||||
resources: [theme1, theme2]
|
resources: [theme1, theme2]
|
||||||
hinclude_default_template: global_hinclude_template
|
hinclude_default_template: global_hinclude_template
|
||||||
|
assets:
|
||||||
|
version: v1
|
||||||
translator:
|
translator:
|
||||||
enabled: true
|
enabled: true
|
||||||
fallback: fr
|
fallback: fr
|
||||||
|
@ -467,9 +467,8 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
public function testAssetHelperWhenTemplatesAreEnabledAndAssetsAreDisabled()
|
public function testAssetHelperWhenTemplatesAreEnabledAndAssetsAreDisabled()
|
||||||
{
|
{
|
||||||
$container = $this->createContainerFromFile('assets_disabled');
|
$container = $this->createContainerFromFile('assets_disabled');
|
||||||
$packages = $container->getDefinition('templating.helper.assets')->getArgument(0);
|
|
||||||
|
|
||||||
$this->assertSame('assets.packages', (string) $packages);
|
$this->assertFalse($container->hasDefinition('templating.helper.assets'));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function createContainer(array $data = array())
|
protected function createContainer(array $data = array())
|
||||||
|
Reference in New Issue
Block a user