capybara-screenshot-diff 1.8.1 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87baa5dd7c412b251fbd55171a131700bada4ec3b3a09739b70482178fce85f6
-  data.tar.gz: 18283f48c01a863c6af2d4a6ef6dce9f987868ad5d27978b3f1aa4f2feb81073
+  metadata.gz: 3e7e3bdfacb7c2fad912c72ade765c9ec6a50f306048a374d8056fc02c27d643
+  data.tar.gz: c1527905de61a1d801c545729d68b811ba91db5902c1ff209b4dc212fa252971
 SHA512:
-  metadata.gz: 6295286f5267b8b956cb8d2f85599812567dae1b228ab9c15720d45fcf37a33a780cfaccbe9b2ab7ec350a99b3e2426594af4eb3b7e3aa4f158d0cba83bb7e26
-  data.tar.gz: c7f891a279ffd74da9ebc3bd1c1f57966010914ff258d84ca62940e03b5efc11ed6b14f72beefc140127f11799c07be9b49a32d6b0bce63f9329cd5255730012
+  metadata.gz: c9c7868fe6d13263db039cf2a7fbb85234abee8f3bc05dd51fc5cc78579a96c1de3f2275782f5c806e9b154472ad51a991cfad1847a54d4811460597a3a4b8fe
+  data.tar.gz: 209f71e33b2b4bdead447293c0e286de6b6e1d945f4e12889e1b4f94675bb8bc035956f19a9897ceeedf278999598bb095991ecd34f2eaffa219d088ea19d577

data/lib/capybara/screenshot/diff/test_methods.rb

@@ -74,12 +74,12 @@ module Capybara
 
           return false unless job
 
-          test_caller = caller(skip_stack_frames)
+          job.prepend(caller[skip_stack_frames])
 
           if Screenshot::Diff.delayed
-            schedule_match_job([test_caller] + job)
+            schedule_match_job(job)
           else
-            error_msg = assert_image_not_changed(job.first, job.last)
+            error_msg = assert_image_not_changed(*job)
             if error_msg
               error = ASSERTION.new(error_msg)
               error.set_backtrace(caller(2))
@@ -88,7 +88,7 @@ module Capybara
           end
         end
 
-        def assert_image_not_changed(name, comparison)
+        def assert_image_not_changed(caller, name, comparison)
           result = comparison.different?
 
           # Cleanup after comparisons
@@ -100,7 +100,7 @@ module Capybara
 
           return unless result
 
-          "Screenshot does not match for '#{name}' #{comparison.error_message}"
+          "Screenshot does not match for '#{name}' #{comparison.error_message}\n#{caller}"
         end
 
         private

data/lib/capybara/screenshot/diff/vcs.rb

@@ -14,7 +14,11 @@ module Capybara
           redirect_target = "#{checkout_path} #{SILENCE_ERRORS}"
           show_command = "git show HEAD~0:./#{vcs_file_path}"
           if Screenshot.use_lfs
-            `#{show_command} | git lfs smudge > #{redirect_target} ; exit ${PIPESTATUS[0]}`
+            `#{show_command} > #{checkout_path}.tmp #{SILENCE_ERRORS}`
+            if $CHILD_STATUS == 0
+              `git lfs smudge < #{checkout_path}.tmp > #{redirect_target}`
+            end
+            File.delete "#{checkout_path}.tmp"
           else
             `#{show_command} > #{redirect_target}`
           end

data/lib/capybara/screenshot/diff/version.rb

@@ -3,7 +3,7 @@
 module Capybara
   module Screenshot
     module Diff
-      VERSION = "1.8.1"
+      VERSION = "1.8.3"
     end
   end
 end

data/lib/capybara/screenshot/diff.rb

@@ -80,7 +80,7 @@ module Capybara
 
         klass.teardown do
           if Screenshot.active? && @test_screenshots.present?
-            track_failures(@test_screenshots, caller)
+            track_failures(@test_screenshots)
             @test_screenshots.clear
           end
         end
@@ -90,16 +90,16 @@ module Capybara
 
       EMPTY_LINE = "\n\n"
 
-      def track_failures(screenshots, original_caller)
+      def track_failures(screenshots)
         test_screenshot_errors = screenshots.map do |caller, name, compare|
-          assert_image_not_changed(name, compare)
+          assert_image_not_changed(caller, name, compare)
         end
 
         test_screenshot_errors.compact!
 
         unless test_screenshot_errors.empty?
           error = ASSERTION.new(test_screenshot_errors.join(EMPTY_LINE))
-          error.set_backtrace(original_caller)
+          error.set_backtrace([])
 
           if is_a?(::Minitest::Runnable)
             failures << error

data/sig/capybara/screenshot/diff/diff.rbs

@@ -22,7 +22,7 @@ module Capybara
 
       private
 
-      def track_failures: (Array[untyped] screenshots, (Array[String] | String) original_caller) -> void
+      def track_failures: (Array[untyped] screenshots) -> void
     end
   end
 end

data/sig/capybara/screenshot/diff/test_methods.rbs

@@ -28,7 +28,7 @@ module Capybara
 
         def screenshot: (name_entity name, ?skip_stack_frames: ::Integer, **untyped options) -> boolish
 
-        def assert_image_not_changed: (String name, ImageCompare comparison) -> ::String?
+        def assert_image_not_changed: (String caller, String name, ImageCompare comparison) -> ::String?
 
         private
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.3
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-15 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack