Merge pull request #56 from grosser/grosser/cov

fix test-coverage
grosser · Aug 11, 2024 · a0354a9 · a0354a9
2 parents d215869 + a8647b5
commit a0354a9
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 179 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -9,21 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.7', '3.0', '3.1', '3.2']
-        rails: ['5.2', '6.0', '6.1', '7.0', '7.1']
+        ruby: ['3.1', '3.2', '3.3']
+        rails: ['6.1', '7.0', '7.1']
         exclude:
-          - ruby: '3.0'
-            rails: '5.2'
-          - ruby: '3.1'
-            rails: '5.2'
-          - ruby: '3.1'
-            rails: '6.0'
-          - ruby: '3.2'
-            rails: '5.2'
-          - ruby: '3.2'
-            rails: '6.0'
           - ruby: '3.2'
             rails: '6.1'
+          - ruby: '3.3'
+            rails: '6.1'
     name: ruby${{ matrix.ruby }} rails${{ matrix.rails }} rake
     env:
       BUNDLE_GEMFILE: gemfiles/rails${{ matrix.rails }}.gemfile

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
       ruby2_keywords
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.7)
     minitest (5.20.0)
     mutex_m (0.2.0)
     rake (13.1.0)
@@ -59,7 +59,7 @@ GEM
     rspec-support (3.12.1)
     ruby2_keywords (0.0.5)
     single_cov (1.11.0)
-    sqlite3 (1.6.8)
+    sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
     timeout (0.4.1)
     tzinfo (2.0.6)

diff --git a/Rakefile b/Rakefile
@@ -12,7 +12,7 @@ desc "Bundle all gemfiles"
 task :bundle_all do
   Bundler.with_original_env do
     Dir["gemfiles/*.gemfile"].each do |gemfile|
-      sh "BUNDLE_GEMFILE=#{gemfile} bundle"
+      sh "BUNDLE_GEMFILE=#{gemfile} bundle #{ENV["CMD"]}"
     end
   end
 end
diff --git a/gemfiles/rails5.2.gemfile b/gemfiles/rails5.2.gemfile
diff --git a/gemfiles/rails5.2.gemfile.lock b/gemfiles/rails5.2.gemfile.lock
diff --git a/gemfiles/rails6.0.gemfile b/gemfiles/rails6.0.gemfile
diff --git a/gemfiles/rails6.0.gemfile.lock b/gemfiles/rails6.0.gemfile.lock
diff --git a/gemfiles/rails6.1.gemfile b/gemfiles/rails6.1.gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.1.0"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.7"
 
 gemspec path: "../"
diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock
@@ -30,6 +30,7 @@ GEM
     diff-lcs (1.5.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
+    mini_portile2 (2.8.7)
     minitest (5.15.0)
     rake (13.0.6)
     rspec (3.11.0)
@@ -46,7 +47,8 @@ GEM
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
     single_cov (1.7.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     zeitwerk (2.5.4)
@@ -63,7 +65,7 @@ DEPENDENCIES
   rspec (~> 3.5)
   single_cov
   soft_deletion!
-  sqlite3 (~> 1.4)
+  sqlite3 (~> 1.7)
 
 BUNDLED WITH
    2.3.12
diff --git a/gemfiles/rails7.0.gemfile b/gemfiles/rails7.0.gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.0.0"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.7"
 
 gemspec path: "../"
diff --git a/gemfiles/rails7.0.gemfile.lock b/gemfiles/rails7.0.gemfile.lock
@@ -29,6 +29,7 @@ GEM
     diff-lcs (1.5.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
+    mini_portile2 (2.8.7)
     minitest (5.15.0)
     rake (13.0.6)
     rspec (3.11.0)
@@ -45,7 +46,8 @@ GEM
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
     single_cov (1.7.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
 
@@ -61,7 +63,7 @@ DEPENDENCIES
   rspec (~> 3.5)
   single_cov
   soft_deletion!
-  sqlite3 (~> 1.4)
+  sqlite3 (~> 1.7)
 
 BUNDLED WITH
    2.3.12
diff --git a/gemfiles/rails7.1.gemfile b/gemfiles/rails7.1.gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.1.0"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.7"
 
 gemspec path: "../"
diff --git a/gemfiles/rails7.1.gemfile.lock b/gemfiles/rails7.1.gemfile.lock
@@ -58,12 +58,14 @@ GEM
     rspec-support (3.12.1)
     ruby2_keywords (0.0.5)
     single_cov (1.11.0)
-    sqlite3 (1.6.8-x86_64-linux)
+    sqlite3 (1.7.3-arm64-darwin)
+    sqlite3 (1.7.3-x86_64-linux)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS
+  arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -75,7 +77,7 @@ DEPENDENCIES
   rspec (~> 3.5)
   single_cov
   soft_deletion!
-  sqlite3 (~> 1.4)
+  sqlite3 (~> 1.7)
 
 BUNDLED WITH
    2.4.21
diff --git a/lib/soft_deletion/core.rb b/lib/soft_deletion/core.rb
@@ -89,8 +89,7 @@ def soft_delete_dependencies
     def update_soft_delete_counter_caches(value)
       each_counter_cached_associations do |association|
         association.load_target unless association.loaded?
-        if association.target
-          target = association.target
+        if (target = association.target) # uncovered TODO: add test coverage for target not existing
           target.class.update_counters(target.id, association.reflection.counter_cache_column => value)
         end
       end
@@ -115,7 +114,7 @@ def _run_soft_delete(method, *args, **kwargs, &block)
     end
 
     def _run_soft_undelete(&block)
-      raise "#{self.class} is not deleted" unless deleted_at
+      raise "#{self.class} is not deleted" unless deleted_at # uncovered TODO: add test coverage
 
       result = false
       limit = deleted_at - 1.hour

diff --git a/spec/soft_deletion_spec.rb b/spec/soft_deletion_spec.rb
@@ -2,7 +2,7 @@
 
 SingleCov.covered!
 SingleCov.covered! file: 'lib/soft_deletion/setup.rb'
-SingleCov.covered! file: 'lib/soft_deletion/core.rb', uncovered: 3 # TODO: fix
+SingleCov.covered! file: 'lib/soft_deletion/core.rb'
 SingleCov.covered! file: 'lib/soft_deletion/dependency.rb'
 
 describe SoftDeletion do