Merge pull request #1639 from wallabag/v2-change-test-dbname

Fix #1635: change database name for test environments (mysql/pgsql)

diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index f902f239522942d7e3fa17d7bb7a77bc88727ebd..3b9262bbab2b35e7564e54c5b95f656923646cf3 100644 (file)
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -12,7 +12,7 @@ parameters:
     test_database_driver: pdo_mysql
     test_database_host: localhost
     test_database_port: 3306
-    test_database_name: wallabag
+    test_database_name: wallabag_test
     test_database_user: root
     test_database_password: ~
     test_database_path: ~

diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index 76685b141c42e0ddc642aa1a8b6a54d5f2ccd491..a5aef02803b6507782ade5f83347ea0742445d0b 100644 (file)
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -12,7 +12,7 @@ parameters:
     test_database_driver: pdo_pgsql
     test_database_host: localhost
     test_database_port:
-    test_database_name: wallabag
+    test_database_name: wallabag_test
     test_database_user: travis
     test_database_password: ~
     test_database_path: ~

diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml
index bf9e036ae64a9b1dea8997afe1e3168486cfc596..8321473ab3f0861350c07468e466aa47e617fef6 100644 (file)
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -1,4 +1,9 @@
 services:
+    # might be fixed in the symfony release
+    # https://github.com/FriendsOfSymfony/FOSUserBundle/issues/2048
+    fos_user.doctrine_registry:
+        alias: doctrine
+
     wallabag_user.auth_code_mailer:
         class: Wallabag\UserBundle\Mailer\AuthCodeMailer
         arguments: