From 48c0d14b2bf02d56d1786893d41eff788586de17 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 2 Jun 2017 19:23:37 +0900 Subject: [PATCH] Let the RDBMS specifiable via envvar --- kaminari-core/test/fake_app/config/database.yml | 5 ++++- test/test_helper.rb | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/kaminari-core/test/fake_app/config/database.yml b/kaminari-core/test/fake_app/config/database.yml index 1842421..b8535bb 100644 --- a/kaminari-core/test/fake_app/config/database.yml +++ b/kaminari-core/test/fake_app/config/database.yml @@ -1,5 +1,8 @@ -test: +sqlite3: &sqlite3 adapter: sqlite3 database: kaminari_test.sqlite3 pool: 5 timeout: 5000 + +test: + <<: *<%= ENV['DB'] %> diff --git a/test/test_helper.rb b/test/test_helper.rb index ab2293f..c82652c 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,6 +4,7 @@ $LOAD_PATH.unshift(File.join(Gem.loaded_specs['kaminari-core'].gem_dir, 'test')) $LOAD_PATH.unshift(File.dirname(__FILE__)) ENV['RAILS_ENV'] ||= 'test' +ENV['DB'] ||= 'sqlite3' require 'rails' require 'active_record'