aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-09-28 22:57:11 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-09-28 22:57:11 +0200
commit917040d4a0b7694ca4f695c02243ffb4283d6901 (patch)
tree0bd70455b7748145a7b944d47c6845ba214b2b4d /app
parent4180fddac1aa011f121a1ab901f9f21aafa46112 (diff)
parentfef4124130484ebdb8194b83a3278e6f970a46fb (diff)
downloadwallabag-917040d4a0b7694ca4f695c02243ffb4283d6901.tar.gz
wallabag-917040d4a0b7694ca4f695c02243ffb4283d6901.tar.zst
wallabag-917040d4a0b7694ca4f695c02243ffb4283d6901.zip
Merge pull request #1434 from wallabag/travis-db
Add multiple database tests on Travis
Diffstat (limited to 'app')
-rw-r--r--app/config/config_test.yml11
-rw-r--r--app/config/parameters.yml.dist12
-rw-r--r--app/config/tests/parameters.yml.dist.mysql58
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql58
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite58
5 files changed, 192 insertions, 5 deletions
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 4dca39d2..2fd489be 100644
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -19,9 +19,14 @@ swiftmailer:
19 19
20doctrine: 20doctrine:
21 dbal: 21 dbal:
22 driver: pdo_sqlite 22 driver: "%test_database_driver%"
23 path: %kernel.root_dir%/../data/db/wallabag_test.sqlite 23 host: "%test_database_host%"
24 host: localhost 24 port: "%test_database_port%"
25 dbname: "%test_database_name%"
26 user: "%test_database_user%"
27 password: "%test_database_password%"
28 charset: UTF8
29 path: "%test_database_path%"
25 orm: 30 orm:
26 metadata_cache_driver: 31 metadata_cache_driver:
27 type: service 32 type: service
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index b3947207..c1f6bc1b 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -1,7 +1,7 @@
1# This file is a "template" of what your parameters.yml file should look like 1# This file is a "template" of what your parameters.yml file should look like
2parameters: 2parameters:
3 database_driver: pdo_sqlite 3 database_driver: pdo_sqlite
4 database_host: 127.0.0.1 4 database_host: 127.0.0.1
5 database_port: ~ 5 database_port: ~
6 database_name: symfony 6 database_name: symfony
7 database_user: root 7 database_user: root
@@ -9,6 +9,14 @@ parameters:
9 database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" 9 database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
10 database_table_prefix: wallabag_ 10 database_table_prefix: wallabag_
11 11
12 test_database_driver: pdo_sqlite
13 test_database_host: 127.0.0.1
14 test_database_port: ~
15 test_database_name: ~
16 test_database_user: ~
17 test_database_password: ~
18 test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
19
12 mailer_transport: smtp 20 mailer_transport: smtp
13 mailer_host: 127.0.0.1 21 mailer_host: 127.0.0.1
14 mailer_user: ~ 22 mailer_user: ~
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
new file mode 100644
index 00000000..d8c23634
--- /dev/null
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -0,0 +1,58 @@
1# This file is a "template" of what your parameters.yml file should look like
2parameters:
3 database_driver: pdo_sqlite
4 database_host: 127.0.0.1
5 database_port: ~
6 database_name: symfony
7 database_user: root
8 database_password: ~
9 database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
10 database_table_prefix: wallabag_
11
12 test_database_driver: pdo_mysql
13 test_database_host: localhost
14 test_database_port: 3306
15 test_database_name: wallabag
16 test_database_user: root
17 test_database_password: ~
18 test_database_path: ~
19
20 mailer_transport: smtp
21 mailer_host: 127.0.0.1
22 mailer_user: ~
23 mailer_password: ~
24
25 locale: en
26
27 # A secret key that's used to generate certain security-related tokens
28 secret: ThisTokenIsNotSoSecretChangeIt
29
30 # wallabag misc
31 app.version: 2.0.0-alpha
32
33 # message to display at the bottom of the page
34 warning_message: >
35 You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
36
37 download_pictures: false # if true, pictures will be stored into data/assets for each article
38
39 # Entry view
40 share_twitter: true
41 share_mail: true
42 share_shaarli: true
43 shaarli_url: http://myshaarli.com
44 share_diaspora: true
45 diaspora_url: http://diasporapod.com
46 flattr: true
47 carrot: true
48 show_printlink: true
49 export_epub: true
50 export_mobi: true
51 export_pdf: true
52
53 # default user config
54 items_on_page: 12
55 theme: material
56 language: en_US
57 from_email: no-reply@wallabag.org
58 rss_limit: 50
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
new file mode 100644
index 00000000..7dc63880
--- /dev/null
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -0,0 +1,58 @@
1# This file is a "template" of what your parameters.yml file should look like
2parameters:
3 database_driver: pdo_sqlite
4 database_host: 127.0.0.1
5 database_port: ~
6 database_name: symfony
7 database_user: root
8 database_password: ~
9 database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
10 database_table_prefix: wallabag_
11
12 test_database_driver: pdo_pgsql
13 test_database_host: localhost
14 test_database_port:
15 test_database_name: wallabag
16 test_database_user: travis
17 test_database_password: ~
18 test_database_path: ~
19
20 mailer_transport: smtp
21 mailer_host: 127.0.0.1
22 mailer_user: ~
23 mailer_password: ~
24
25 locale: en
26
27 # A secret key that's used to generate certain security-related tokens
28 secret: ThisTokenIsNotSoSecretChangeIt
29
30 # wallabag misc
31 app.version: 2.0.0-alpha
32
33 # message to display at the bottom of the page
34 warning_message: >
35 You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
36
37 download_pictures: false # if true, pictures will be stored into data/assets for each article
38
39 # Entry view
40 share_twitter: true
41 share_mail: true
42 share_shaarli: true
43 shaarli_url: http://myshaarli.com
44 share_diaspora: true
45 diaspora_url: http://diasporapod.com
46 flattr: true
47 carrot: true
48 show_printlink: true
49 export_epub: true
50 export_mobi: true
51 export_pdf: true
52
53 # default user config
54 items_on_page: 12
55 theme: material
56 language: en_US
57 from_email: no-reply@wallabag.org
58 rss_limit: 50
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
new file mode 100644
index 00000000..3ef7cda4
--- /dev/null
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -0,0 +1,58 @@
1# This file is a "template" of what your parameters.yml file should look like
2parameters:
3 database_driver: pdo_sqlite
4 database_host: 127.0.0.1
5 database_port: ~
6 database_name: symfony
7 database_user: root
8 database_password: ~
9 database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
10 database_table_prefix: wallabag_
11
12 test_database_driver: pdo_sqlite
13 test_database_host: localhost
14 test_database_port:
15 test_database_name: ~
16 test_database_user: ~
17 test_database_password: ~
18 test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
19
20 mailer_transport: smtp
21 mailer_host: 127.0.0.1
22 mailer_user: ~
23 mailer_password: ~
24
25 locale: en
26
27 # A secret key that's used to generate certain security-related tokens
28 secret: ThisTokenIsNotSoSecretChangeIt
29
30 # wallabag misc
31 app.version: 2.0.0-alpha
32
33 # message to display at the bottom of the page
34 warning_message: >
35 You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
36
37 download_pictures: false # if true, pictures will be stored into data/assets for each article
38
39 # Entry view
40 share_twitter: true
41 share_mail: true
42 share_shaarli: true
43 shaarli_url: http://myshaarli.com
44 share_diaspora: true
45 diaspora_url: http://diasporapod.com
46 flattr: true
47 carrot: true
48 show_printlink: true
49 export_epub: true
50 export_mobi: true
51 export_pdf: true
52
53 # default user config
54 items_on_page: 12
55 theme: material
56 language: en_US
57 from_email: no-reply@wallabag.org
58 rss_limit: 50