From 5eeb57c1c725a04c6c79825b94cc81a4027e860d Mon Sep 17 00:00:00 2001 From: Roy Kaldung Date: Fri, 4 Jan 2013 15:06:25 +0100 Subject: [PATCH 1/2] added database configuration for mysql test --- config/database.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/database.yml b/config/database.yml index f6f905dbd..bcf25e94a 100644 --- a/config/database.yml +++ b/config/database.yml @@ -18,6 +18,16 @@ test: database: db/test.sqlite3 timeout: 5000 pool: 50 + +test_mysql: + adapter: mysql2 + database: zammad_test + pool: 50 + timeout: 5000 + encoding: utf8 + username: zammad_test + password: zammad_test + host: 127.0.0.1 production: adapter: mysql2 From dfc7f3484fdbe4fac1c3c63962ee6962d1d4b850 Mon Sep 17 00:00:00 2001 From: Roy Kaldung Date: Fri, 4 Jan 2013 15:07:10 +0100 Subject: [PATCH 2/2] added config for mysql test --- config/environments/test_mysql.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 config/environments/test_mysql.rb diff --git a/config/environments/test_mysql.rb b/config/environments/test_mysql.rb new file mode 100644 index 000000000..e69de29bb