diff --git a/.gitignore b/.gitignore index 9ea23d8..53c3158 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,9 @@ Gemfile.lock # Ignore db files *.sqlite3 +# Ignore temprary db files +*.sqlite3-shm +*.sqlite3-wal # Ignore editor files .idea diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1f92dc5..61ba67f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -22,9 +22,6 @@ require 'faker' require 'threads' -$LOAD_PATH.unshift(File.dirname(__FILE__)) -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) - require 'meilisearch-rails' require 'rspec' require 'rails/all' @@ -39,9 +36,6 @@ # Required for serializing objects similar to production environments GlobalID.app = 'meilisearch-test' -OLD_RAILS = Gem.loaded_specs['rails'].version < Gem::Version.new('4.0') -NEW_RAILS = Gem.loaded_specs['rails'].version >= Gem::Version.new('6.0') - Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |file| require file } RSpec.configure do |c| diff --git a/spec/support/active_record_schema.rb b/spec/support/active_record_schema.rb index 832e021..5150c38 100644 --- a/spec/support/active_record_schema.rb +++ b/spec/support/active_record_schema.rb @@ -15,13 +15,7 @@ ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) -FileUtils.rm('data.sqlite3') if File.exist?('data.sqlite3') - -unless OLD_RAILS || NEW_RAILS - require 'active_job/test_helper' - - ActiveJob::Base.queue_adapter = :test -end +FileUtils.rm_f('data.sqlite3') def ar_schema @ar_schema ||= ActiveRecord::Schema.new diff --git a/spec/support/sequel_db.rb b/spec/support/sequel_db.rb index 48ad397..cc6bbe2 100644 --- a/spec/support/sequel_db.rb +++ b/spec/support/sequel_db.rb @@ -7,4 +7,4 @@ def sequel_db end) end -FileUtils.rm('sequel_data.sqlite3') if File.exist?('sequel_data.sqlite3') +FileUtils.rm_f('sequel_data.sqlite3')