fix

Author: seuros

spec/spec_helper.rb

@@ -98,16 +98,19 @@ def sqlite?
 
 # Require our gem
 require 'closure_tree'
+
+ActiveRecord::Tasks::DatabaseTasks.drop_current(:primary)
 begin
   ActiveRecord::Base.establish_connection(:primary)
 rescue
-  ActiveRecord::Tasks::DatabaseTasks.create_current('primary')
+  ActiveRecord::Tasks::DatabaseTasks.create_current(:primary)
 end
-
+ActiveRecord::Tasks::DatabaseTasks.drop_current(:secondary)
 begin
   ActiveRecord::Base.establish_connection(:secondary)
+  ActiveRecord::Base.database_exists?(:secondary)
 rescue
-  ActiveRecord::Tasks::DatabaseTasks.create_current('secondary')
+  ActiveRecord::Tasks::DatabaseTasks.create_current(:secondary)
 end
 
 # Load test helpers

spec/support/schema.rb

@@ -2,12 +2,14 @@
 
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
+
+  connects_to database: { writing: :primary, reading: :primary }
 end
 
 class SecondDatabaseRecord < ActiveRecord::Base
   self.abstract_class = true
 
-  establish_connection :secondary
+  connects_to database: { writing: :secondary, reading: :secondary }
 end
 
 ActiveRecord::Schema.define(version: 0) do
@@ -151,6 +153,7 @@ class SecondDatabaseRecord < ActiveRecord::Base
   add_foreign_key(:tag_hierarchies, :tags, column: 'descendant_id', on_delete: :cascade)
 end
 
+SecondDatabaseRecord.establish_connection
 SecondDatabaseRecord.connection_pool.with_connection do |connection|
   ActiveRecord::Schema.define(version: 0) do
     connection.create_table 'menu_items', force: :cascade do |t|