Skip to content

Commit 1bbf35f

Browse files
Merge #414
414: Remove legacy code in specs r=brunoocasali a=ellnix Please see the descriptions of each commit for explanations. Co-authored-by: ellnix <[email protected]>
2 parents 1483ccf + 4f33e1b commit 1bbf35f

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ Gemfile.lock
7070

7171
# Ignore db files
7272
*.sqlite3
73+
# Ignore temprary db files
74+
*.sqlite3-shm
75+
*.sqlite3-wal
7376

7477
# Ignore editor files
7578
.idea

spec/spec_helper.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
require 'faker'
2323
require 'threads'
2424

25-
$LOAD_PATH.unshift(File.dirname(__FILE__))
26-
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
27-
2825
require 'meilisearch-rails'
2926
require 'rspec'
3027
require 'rails/all'
@@ -40,9 +37,6 @@
4037
# Required for serializing objects similar to production environments
4138
GlobalID.app = 'meilisearch-test'
4239

43-
OLD_RAILS = Gem.loaded_specs['rails'].version < Gem::Version.new('4.0')
44-
NEW_RAILS = Gem.loaded_specs['rails'].version >= Gem::Version.new('6.0')
45-
4640
Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |file| require file }
4741

4842
RSpec.configure do |c|

spec/support/active_record_schema.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515

1616
ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks)
1717

18-
FileUtils.rm('data.sqlite3') if File.exist?('data.sqlite3')
19-
20-
unless OLD_RAILS || NEW_RAILS
21-
require 'active_job/test_helper'
22-
23-
ActiveJob::Base.queue_adapter = :test
24-
end
18+
FileUtils.rm_f('data.sqlite3')
2519

2620
def ar_schema
2721
@ar_schema ||= ActiveRecord::Schema.new

spec/support/sequel_db.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ def sequel_db
77
end)
88
end
99

10-
FileUtils.rm('sequel_data.sqlite3') if File.exist?('sequel_data.sqlite3')
10+
FileUtils.rm_f('sequel_data.sqlite3')

0 commit comments

Comments
 (0)