Fix

isc · Oct 19, 2023 · 121ebf6 · 121ebf6
1 parent 976a8d5
commit 121ebf6
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/test/test_database_schema.rb b/test/test_database_schema.rb
@@ -1,14 +1,8 @@
 test_adapter = ENV['adapter'] || ENV['ADAPTER'] || 'postgres'
+ActiveRecord::Base.connection.execute 'create database "adminium-fixture"' if ENV['CI']
+conn_spec = ActiveRecord::Base.configurations.find_db_config("fixture-#{test_adapter}").configuration_hash
 Rails.configuration.test_database_conn_spec =
-  if ENV['CI']
-    ActiveRecord::Base.connection.execute 'create database "adminium-fixture"'
-    conn_spec = ENV['DATABASE_URL'].split('/')
-    conn_spec[-1] = 'adminium-fixture'
-    conn_spec.join('/')
-  else
-    conn_spec = ActiveRecord::Base.configurations.find_db_config("fixture-#{test_adapter}").configuration_hash
-    "#{conn_spec[:adapter]}://#{conn_spec[:username]}@#{conn_spec[:host]}/#{conn_spec[:database]}"
-  end
+  "#{conn_spec[:adapter]}://#{conn_spec[:username]}@#{conn_spec[:host]}/#{conn_spec[:database]}"
 
 ActiveRecord::Base.establish_connection Rails.configuration.test_database_conn_spec
 ActiveRecord::Schema.verbose = false