capybara-screenshot-diff 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e982564438ee16c8ae6900407e80ab1921888bd83b14fc6efc1c9a20fb6b79d5
-  data.tar.gz: 4893ded8cd25dbf93d9147b21e3a1bf09d80c544a390648eae58ef46dca85c78
+  metadata.gz: ace795ddf840ec95a7b217509b7ab9b510e70eb9711358b98aade93ebaf7617a
+  data.tar.gz: d4b5bef585802d7f90ac13237337c041e5b02ec996509e075245ba0e7fc76cf7
 SHA512:
-  metadata.gz: 146c1928e4fd32ac25d7ad6813f81adb6e6a82004ab2bd589281e8fbc130001f4cddea57e706d7023dcb760a0d907d9a766375ef25a851e44962db6bbdd3e80a
-  data.tar.gz: 474fca1d1a8e27508593efe4517f6fe2d58608693acba531943e3220d6ae169445963517da6b40b5f7c095f6ef27f038cf57c397f7e17e0f3cae728307f085cd
+  metadata.gz: db81714ed5e680cce7d14ace467ed21c46a776e55350fcf3e3a8c1d3c9a1f6cbb866213383f5284089725804431544861f43ca43c7edcda37b75e5bdbe53beef
+  data.tar.gz: c2850fa792d957908b3b2e5a937807d31e8b30566b40c7ad403b3d63eede4c023e9f6205f9f513a5e723f5ab889a357e1ad5792028ffd43ee78ceb93ca74dee3

data/capybara-screenshot-diff.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "actionpack", ">= 6.1", "< 8"
   spec.add_runtime_dependency "capybara", ">= 2", "< 4"
-  spec.add_runtime_dependency "chunky_png", ">= 1.3", "< 2"
+  spec.add_runtime_dependency "chunky_png", "~> 1.3"
 end

data/lib/capybara/screenshot/diff/drivers/utils.rb

@@ -10,11 +10,13 @@ module Capybara
             result << :vips if defined?(Vips) || require("vips")
           rescue LoadError
             # vips not present
+            Object.send(:remove_const, :Vips) if defined?(Vips)
           end
           begin
             result << :chunky_png if defined?(ChunkyPNG) || require("chunky_png")
           rescue LoadError
             # chunky_png not present
+            Object.send(:remove_const, :ChunkyPNG) if defined?(ChunkyPNG)
           end
           result
         end

data/lib/capybara/screenshot/diff/drivers/vips_driver.rb

@@ -3,7 +3,7 @@
 begin
   require "vips"
 rescue LoadError => e
-  warn 'Required ruby-vips gem is missing. Add `gem "ruby-vips"` to Gemfile' if e.message.include?("vips")
+  raise 'Required ruby-vips gem is missing. Add `gem "ruby-vips"` to Gemfile' if e.message.match?(/vips/i)
   raise
 end
 

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

@@ -118,10 +118,9 @@ module Capybara
           pending_image = BrowserHelpers.pending_image_to_load
           break unless pending_image
 
-          assert(
-            (Time.now - start) < timeout,
-            "Images not loaded after #{timeout}s: #{pending_image.inspect}"
-          )
+          if (Time.now - start) >= timeout
+            raise Capybara::Screenshot::Diff::ASSERTION, "Images not loaded after #{timeout}s: #{pending_image.inspect}"
+          end
 
           sleep 0.025
         end

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/version.rb

@@ -3,7 +3,7 @@
 module Capybara
   module Screenshot
     module Diff
-      VERSION = "1.8.0"
+      VERSION = "1.8.2"
     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.0
+  version: 1.8.2
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-13 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -54,22 +54,16 @@ dependencies:
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 description: Save screen shots and track changes with graphical diff
 email:
 - uwe@kubosch.no