diff --git a/.ruby-version b/.ruby-version index be94e6f5..15a27998 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.3.0 diff --git a/Gemfile b/Gemfile index 8510ba34..bbc0ca34 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -ruby '3.2.2' +ruby '3.3.0' gem 'attr_encrypted' gem 'binary_search', require: 'binary_search/pure' diff --git a/Gemfile.lock b/Gemfile.lock index 4a46704f..350f4801 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -450,7 +450,7 @@ DEPENDENCIES webdrivers RUBY VERSION - ruby 3.2.2p53 + ruby 3.3.0p0 BUNDLED WITH 2.4.21 diff --git a/test/test_database_schema.rb b/test/test_database_schema.rb index cfd8130f..2ad477f9 100644 --- a/test/test_database_schema.rb +++ b/test/test_database_schema.rb @@ -1,5 +1,9 @@ test_adapter = ENV['adapter'] || ENV['ADAPTER'] || 'postgres' -ActiveRecord::Base.connection.execute 'create database "adminium-fixture"' if ENV['CI'] +begin + ActiveRecord::Base.connection.execute 'create database "adminium-fixture"' +rescue ActiveRecord::StatementInvalid => e + raise e unless e.message.starts_with? 'PG::DuplicateDatabase' +end conn_spec = ActiveRecord::Base.configurations.find_db_config("fixture-#{test_adapter}").configuration_hash Rails.configuration.test_database_conn_spec = "#{conn_spec[:adapter]}://#{conn_spec[:username]}:#{conn_spec[:password]}@#{conn_spec[:host]}/#{conn_spec[:database]}"