diff --git a/app/config/config_test.yml b/app/config/config_test.yml index d43d872ab..3eab6fb28 100644 --- 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: ~ diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 7c7413fb9..d45839f4d 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -19,14 +19,6 @@ parameters: database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" database_table_prefix: wallabag_ - test_database_driver: pdo_sqlite - test_database_host: 127.0.0.1 - test_database_port: ~ - test_database_name: ~ - test_database_user: ~ - test_database_password: ~ - test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" - mailer_transport: smtp mailer_host: 127.0.0.1 mailer_user: ~ diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml new file mode 100644 index 000000000..696c95ef7 --- /dev/null +++ b/app/config/parameters_test.yml @@ -0,0 +1,8 @@ +parameters: + test_database_driver: pdo_sqlite + test_database_host: 127.0.0.1 + test_database_port: null + test_database_name: null + test_database_user: null + test_database_password: null + test_database_path: '%kernel.root_dir%/../data/db/wallabag_testYO.sqlite' diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql deleted file mode 100644 index 1951f0216..000000000 --- a/app/config/tests/parameters.yml.dist.mysql +++ /dev/null @@ -1,37 +0,0 @@ -# This file is a "template" of what your parameters.yml file should look like -parameters: - database_driver: pdo_sqlite - database_host: 127.0.0.1 - database_port: ~ - database_name: symfony - database_user: root - database_password: ~ - database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" - database_table_prefix: wallabag_ - - test_database_driver: pdo_mysql - test_database_host: localhost - test_database_port: 3306 - test_database_name: wallabag_test - test_database_user: root - test_database_password: ~ - test_database_path: ~ - - mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: ~ - mailer_password: ~ - - locale: en - - # A secret key that's used to generate certain security-related tokens - secret: ThisTokenIsNotSoSecretChangeIt - - # two factor stuff - twofactor_auth: true - twofactor_sender: no-reply@wallabag.org - - # fosuser stuff - fosuser_confirmation: true - - from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql deleted file mode 100644 index 36ad6cde5..000000000 --- a/app/config/tests/parameters.yml.dist.pgsql +++ /dev/null @@ -1,37 +0,0 @@ -# This file is a "template" of what your parameters.yml file should look like -parameters: - database_driver: pdo_sqlite - database_host: 127.0.0.1 - database_port: ~ - database_name: symfony - database_user: root - database_password: ~ - database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" - database_table_prefix: wallabag_ - - test_database_driver: pdo_pgsql - test_database_host: localhost - test_database_port: - test_database_name: wallabag_test - test_database_user: travis - test_database_password: ~ - test_database_path: ~ - - mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: ~ - mailer_password: ~ - - locale: en - - # A secret key that's used to generate certain security-related tokens - secret: ThisTokenIsNotSoSecretChangeIt - - # two factor stuff - twofactor_auth: true - twofactor_sender: no-reply@wallabag.org - - # fosuser stuff - fosuser_confirmation: true - - from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite deleted file mode 100644 index 6564014aa..000000000 --- a/app/config/tests/parameters.yml.dist.sqlite +++ /dev/null @@ -1,37 +0,0 @@ -# This file is a "template" of what your parameters.yml file should look like -parameters: - database_driver: pdo_sqlite - database_host: 127.0.0.1 - database_port: ~ - database_name: symfony - database_user: root - database_password: ~ - database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" - database_table_prefix: wallabag_ - - test_database_driver: pdo_sqlite - test_database_host: localhost - test_database_port: - test_database_name: ~ - test_database_user: ~ - test_database_password: ~ - test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" - - mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: ~ - mailer_password: ~ - - locale: en - - # A secret key that's used to generate certain security-related tokens - secret: ThisTokenIsNotSoSecretChangeIt - - # two factor stuff - twofactor_auth: true - twofactor_sender: no-reply@wallabag.org - - # fosuser stuff - fosuser_confirmation: true - - from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters_test.mysql.yml b/app/config/tests/parameters_test.mysql.yml new file mode 100644 index 000000000..d8512845f --- /dev/null +++ b/app/config/tests/parameters_test.mysql.yml @@ -0,0 +1,8 @@ +parameters: + test_database_driver: pdo_mysql + test_database_host: localhost + test_database_port: 3306 + test_database_name: wallabag_test + test_database_user: root + test_database_password: ~ + test_database_path: ~ diff --git a/app/config/tests/parameters_test.pgsql.yml b/app/config/tests/parameters_test.pgsql.yml new file mode 100644 index 000000000..41383868d --- /dev/null +++ b/app/config/tests/parameters_test.pgsql.yml @@ -0,0 +1,8 @@ +parameters: + test_database_driver: pdo_pgsql + test_database_host: localhost + test_database_port: + test_database_name: wallabag_test + test_database_user: travis + test_database_password: ~ + test_database_path: ~ diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml new file mode 100644 index 000000000..6e9f98de5 --- /dev/null +++ b/app/config/tests/parameters_test.sqlite.yml @@ -0,0 +1,8 @@ +parameters: + test_database_driver: pdo_sqlite + test_database_host: localhost + test_database_port: + test_database_name: ~ + test_database_user: ~ + test_database_password: ~ + test_database_path: "%kernel.root_dir%/../data/db/wallabag_testHU.sqlite" diff --git a/build.xml b/build.xml index 2ccf49448..37b40743a 100644 --- a/build.xml +++ b/build.xml @@ -42,8 +42,8 @@ - - + + @@ -56,8 +56,8 @@ - - + + @@ -70,8 +70,8 @@ - - + +