From: Jeremy Benoist Date: Mon, 1 Feb 2016 12:46:32 +0000 (+0100) Subject: Merge pull request #1639 from wallabag/v2-change-test-dbname X-Git-Tag: 2.0.0-beta.1~62 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=74d8afa5fa38af083bbacc63d76b904c01808f14;hp=feb02cb709b7f72330fabcac2f81d0fabdbf1a9b;p=github%2Fwallabag%2Fwallabag.git 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 f902f239..3b9262bb 100644 --- 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 76685b14..a5aef028 100644 --- 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 bf9e036a..8321473a 100644 --- 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: