diff --git a/lib/parallel_tests/tasks.rb b/lib/parallel_tests/tasks.rb index a953b984..17f3044a 100644 --- a/lib/parallel_tests/tasks.rb +++ b/lib/parallel_tests/tasks.rb @@ -15,7 +15,7 @@ def load_lib end def purge_before_load - if Gem::Version.new(Rails.version) > Gem::Version.new('4.2.0') + if ActiveRecord.version > Gem::Version.new('4.2.0') Rake::Task.task_defined?('db:purge') ? 'db:purge' : 'app:db:purge' end end @@ -90,7 +90,7 @@ def parse_args(args) end def schema_format_based_on_rails_version - if rails_7_or_greater? + if active_record_7_or_greater? ActiveRecord.schema_format else ActiveRecord::Base.schema_format @@ -98,7 +98,7 @@ def schema_format_based_on_rails_version end def schema_type_based_on_rails_version - if rails_61_or_greater? || schema_format_based_on_rails_version == :ruby + if active_record_61_or_greater? || schema_format_based_on_rails_version == :ruby "schema" else "structure" @@ -129,7 +129,7 @@ def build_run_command(type, args) end def configured_databases - return [] unless defined?(ActiveRecord) && rails_61_or_greater? + return [] unless defined?(ActiveRecord) && active_record_61_or_greater? @@configured_databases ||= ActiveRecord::Tasks::DatabaseTasks.setup_initial_database_yaml end @@ -148,12 +148,12 @@ def for_each_database(&block) private - def rails_7_or_greater? - Gem::Version.new(Rails.version) >= Gem::Version.new('7.0') + def active_record_7_or_greater? + ActiveRecord.version >= Gem::Version.new('7.0') end - def rails_61_or_greater? - Gem::Version.new(Rails.version) >= Gem::Version.new('6.1.0') + def active_record_61_or_greater? + ActiveRecord.version >= Gem::Version.new('6.1.0') end end end diff --git a/spec/parallel_tests/tasks_spec.rb b/spec/parallel_tests/tasks_spec.rb index 5afc42c2..ff2fa046 100644 --- a/spec/parallel_tests/tasks_spec.rb +++ b/spec/parallel_tests/tasks_spec.rb @@ -202,19 +202,19 @@ def call(command, grep) end describe ".purge_before_load" do - context 'Rails < 4.2.0' do + context 'ActiveRecord < 4.2.0' do before do - stub_const('Rails', double(version: '3.2.1')) + stub_const('ActiveRecord', double(version: Gem::Version.new('3.2.1'))) end - it "should return nil for Rails < 4.2.0" do + it "should return nil for ActiveRecord < 4.2.0" do expect(ParallelTests::Tasks.purge_before_load).to eq nil end end - context 'Rails > 4.2.0' do + context 'ActiveRecord > 4.2.0' do before do - stub_const('Rails', double(version: '4.2.8')) + stub_const('ActiveRecord', double(version: Gem::Version.new('4.2.8'))) end it "should return db:purge when defined" do