Merge remote-tracking branch 'origin/master' into 2.2

[github/wallabag/wallabag.git] / app / config / config_test.yml

diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 2fd489bea4a4ef1f0c1ed68562e84c22fdfe9645..f5e2c25ead1bca8ccb1b9980fa48657f5c864c76 100644 (file)
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -1,5 +1,6 @@
 imports:
     - { resource: config_dev.yml }
+    - { resource: parameters_test.yml }
 
 framework:
     test: ~
@@ -7,6 +8,8 @@ framework:
         storage_id: session.storage.mock_file
     profiler:
         collect: false
+    translator:
+        enabled: false
 
 web_profiler:
     toolbar: false
@@ -25,7 +28,7 @@ doctrine:
         dbname: "%test_database_name%"
         user: "%test_database_user%"
         password: "%test_database_password%"
-        charset: UTF8
+        charset: "%test_database_charset%"
         path: "%test_database_path%"
     orm:
         metadata_cache_driver: