From 4b7a1eff434c95596ecfe3c2fe8692b7b921df95 Mon Sep 17 00:00:00 2001 From: Andrei Kaleshka Date: Wed, 1 May 2024 17:09:21 +0200 Subject: [PATCH] fix tests on CI --- test/dummy_app/db/secondary_schema.rb | 2 +- test/rake_task_secondary_test.rb | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/dummy_app/db/secondary_schema.rb b/test/dummy_app/db/secondary_schema.rb index d4a2a0c..f23614c 100644 --- a/test/dummy_app/db/secondary_schema.rb +++ b/test/dummy_app/db/secondary_schema.rb @@ -10,5 +10,5 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 0) do +ActiveRecord::Schema[7.1].define(version: 2013_09_06_111513) do end diff --git a/test/rake_task_secondary_test.rb b/test/rake_task_secondary_test.rb index 03f853e..eed3210 100644 --- a/test/rake_task_secondary_test.rb +++ b/test/rake_task_secondary_test.rb @@ -8,10 +8,12 @@ end around do |block| - ActiveRecord::Tasks::DatabaseTasks.with_temporary_connection(TestingState.db_config["secondary"]) do - utils.cleanup - block.call - end + original_db_config = ActiveRecord::Base.connection_db_config + ActiveRecord::Base.establish_connection(TestingState.db_config["secondary"]) + utils.cleanup + block.call + ensure + ActiveRecord::Base.establish_connection(original_db_config) end describe "db:rollback_branches" do