Merge pull request #32 from smasry/rails_7_1_2_compatibility

Updating nulldb adapater for 7.1.2 compatibility
onemedical · Dec 14, 2023 · 0b16502 · 0b16502
2 parents 7bf660e + a607c4b
commit 0b16502
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/acts_as_scrubbable.gemspec b/acts_as_scrubbable.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'guard-rspec'  , '~> 4.6'
   s.add_development_dependency 'pry-byebug'   , '~> 3.2'
   s.add_development_dependency 'terminal-notifier-guard' , '~> 1.6'
-  s.add_development_dependency 'activerecord-nulldb-adapter', '~> 0.3'
+  s.add_development_dependency 'activerecord-nulldb-adapter', '~> 1.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")

diff --git a/lib/acts_as_scrubbable/ar_class_processor.rb b/lib/acts_as_scrubbable/ar_class_processor.rb
@@ -28,7 +28,7 @@ def process(num_of_batches)
       end
 
       ActsAsScrubbable.logger.info Term::ANSIColor.blue("#{scrubbed_count} #{ar_class} objects scrubbed")
-      ActiveRecord::Base.connection.verify!
+      ActiveRecord::Base.connection.verify! unless ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::NullDBAdapter)
 
       ActsAsScrubbable.logger.info Term::ANSIColor.white("Scrub Complete!")
     end

diff --git a/lib/acts_as_scrubbable/task_runner.rb b/lib/acts_as_scrubbable/task_runner.rb
@@ -55,7 +55,7 @@ def scrub(num_of_batches: nil, skip_before_hooks: false, skip_after_hooks: false
       Parallel.each(ar_classes) do |ar_class|
         ActsAsScrubbable::ArClassProcessor.new(ar_class).process(num_of_batches)
       end
-      ActiveRecord::Base.connection.verify!
+      ActiveRecord::Base.connection.verify! unless ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::NullDBAdapter)
 
       after_hooks unless skip_after_hooks
     end

diff --git a/lib/acts_as_scrubbable/version.rb b/lib/acts_as_scrubbable/version.rb
@@ -1,3 +1,3 @@
 module ActsAsScrubbable
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end
diff --git a/spec/lib/acts_as_scrubbable/ar_class_processor_spec.rb b/spec/lib/acts_as_scrubbable/ar_class_processor_spec.rb
@@ -37,7 +37,6 @@
     end
 
     it "calls the expected helper classes with the expected batch size" do
-      expect(ActiveRecord::Base.connection).to receive(:verify!)
       expect(update_processor_mock).to receive(:scrub_query).with(query)
       subject.process(num_of_batches)
       expect(ActsAsScrubbable::ParallelTableScrubber).to have_received(:new).with(ar_class, 256)