diff --git a/Tests/Fixtures/App/AppKernel.php b/Tests/Fixtures/App/AppKernel.php index 20f9a4bd5..bfec677b8 100644 --- a/Tests/Fixtures/App/AppKernel.php +++ b/Tests/Fixtures/App/AppKernel.php @@ -12,7 +12,10 @@ class AppKernel extends Kernel new Chill\ReportBundle\ChillReportBundle(), new Symfony\Bundle\TwigBundle\TwigBundle(), new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(), - new Doctrine\Bundle\DoctrineBundle\DoctrineBundle() + new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), + new Chill\MainBundle\ChillMainBundle(), + new Chill\PersonBundle\ChillPersonBundle(), + new \Symfony\Bundle\AsseticBundle\AsseticBundle(), ); } diff --git a/Tests/Fixtures/App/config/config.yml b/Tests/Fixtures/App/config/config.yml index 49bf26edf..e5122e256 100644 --- a/Tests/Fixtures/App/config/config.yml +++ b/Tests/Fixtures/App/config/config.yml @@ -24,4 +24,7 @@ doctrine: charset: UTF8 orm: auto_generate_proxy_classes: "%kernel.debug%" - auto_mapping: true \ No newline at end of file + auto_mapping: true + +chill_main: + available_languages: [ fr, nl, en ] \ No newline at end of file diff --git a/Tests/Fixtures/App/config/parameters.yml b/Tests/Fixtures/App/config/parameters.yml index fa3e55dae..3221c992b 100644 --- a/Tests/Fixtures/App/config/parameters.yml +++ b/Tests/Fixtures/App/config/parameters.yml @@ -3,4 +3,5 @@ parameters: database_port: 5434 database_name: symfony database_user: symfony - database_password: symfony \ No newline at end of file + database_password: symfony + locale: fr \ No newline at end of file diff --git a/Tests/Fixtures/App/config/parameters.yml.dist b/Tests/Fixtures/App/config/parameters.yml.dist index fa3e55dae..3221c992b 100644 --- a/Tests/Fixtures/App/config/parameters.yml.dist +++ b/Tests/Fixtures/App/config/parameters.yml.dist @@ -3,4 +3,5 @@ parameters: database_port: 5434 database_name: symfony database_user: symfony - database_password: symfony \ No newline at end of file + database_password: symfony + locale: fr \ No newline at end of file diff --git a/composer.json b/composer.json index f4ccd8fd4..f8dc65c4e 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,12 @@ "doctrine/common": "2.4.*@dev", "doctrine/doctrine-bundle": "~1.2@dev", "chill-project/main": "dev-master", - "chill-project/custom-fields": "dev-master" + "chill-project/custom-fields": "dev-master", + "chill-project/person": "dev-master" }, "require-dev": { + "chill-project/main": "dev-master@dev", + "chill-project/custom-fields": "dev-master@dev", + "chill-project/person": "dev-master@dev" } }