diff --git a/kaminari-core/test/fake_app/active_record/config.rb b/kaminari-core/test/fake_app/active_record/config.rb deleted file mode 100644 index c78973f..0000000 --- a/kaminari-core/test/fake_app/active_record/config.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true -# database -ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: 'kaminari_test.sqlite3' diff --git a/kaminari-core/test/fake_app/config/database.yml b/kaminari-core/test/fake_app/config/database.yml new file mode 100644 index 0000000..1842421 --- /dev/null +++ b/kaminari-core/test/fake_app/config/database.yml @@ -0,0 +1,5 @@ +test: + adapter: sqlite3 + database: kaminari_test.sqlite3 + pool: 5 + timeout: 5000 diff --git a/kaminari-core/test/fake_app/rails_app.rb b/kaminari-core/test/fake_app/rails_app.rb index bedeca7..c8b52be 100644 --- a/kaminari-core/test/fake_app/rails_app.rb +++ b/kaminari-core/test/fake_app/rails_app.rb @@ -2,8 +2,8 @@ # require 'rails/all' require 'action_controller/railtie' require 'action_view/railtie' +require 'active_record/railtie' if defined? ActiveRecord -require 'fake_app/active_record/config' if defined? ActiveRecord # config app = Class.new(Rails::Application) app.config.secret_key_base = app.config.secret_token = '3b7cd727ee24e8444053437c36cc66c4'