devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-07 15:18:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix #1635: change database name for test environments (mysql/pgsql)
This commit is contained in:
Jeremy Benoist 2016-02-01 13:46:32 +01:00
commit 74d8afa5fa
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/config/tests/parameters.yml.dist.mysql
View File

@ -12,7 +12,7 @@ parameters:
test_database_driver: pdo_mysql test_database_driver: pdo_mysql
test_database_host: localhost test_database_host: localhost
test_database_port: 3306 test_database_port: 3306
test_database_name: wallabag test_database_name: wallabag_test
test_database_user: root test_database_user: root
test_database_password: ~ test_database_password: ~
test_database_path: ~ test_database_path: ~

2
app/config/tests/parameters.yml.dist.pgsql
View File

@ -12,7 +12,7 @@ parameters:
test_database_driver: pdo_pgsql test_database_driver: pdo_pgsql
test_database_host: localhost test_database_host: localhost
test_database_port: test_database_port:
test_database_name: wallabag test_database_name: wallabag_test
test_database_user: travis test_database_user: travis
test_database_password: ~ test_database_password: ~
test_database_path: ~ test_database_path: ~

5
src/Wallabag/UserBundle/Resources/config/services.yml
View File

@ -1,4 +1,9 @@
services: 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: wallabag_user.auth_code_mailer:
class: Wallabag\UserBundle\Mailer\AuthCodeMailer class: Wallabag\UserBundle\Mailer\AuthCodeMailer
arguments: arguments: