fix tests on CI

widefix · May 1, 2024 · 4b7a1ef · 4b7a1ef
1 parent 244f60c
commit 4b7a1ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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