capybara-screenshot-diff 1.4.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 478b12e69b1ab3bcf453a4e77d643fa4b31557120eb632ec84144453aaaa69e0
-  data.tar.gz: 61a33c7f216c6094c194f2d73521827f96cee8b8aff70d33d15b9acf399a70ac
+  metadata.gz: 16702f818a4fa7e25a088ed4906ba3460680e4d28cd13b6f8e3e32e199883249
+  data.tar.gz: f1e4b515cc4f7cf731c0712c92eaf7330dcd355b0af9d47bdf23d070634c6411
 SHA512:
-  metadata.gz: 9e63d9f1d7018f33484f56364952cd3e8d3f4345dad74b3e4c2a71252b72a481d0cfd667da62ca21a296c887b14a5e823a915aea0e3c1da2d26000de7e279899
-  data.tar.gz: 4e6127676eceb695a7036035d40f6faf42f93533c08554044934868c1a3ba0df98fbf92b19eff339bf2a24b79c52e2bfb08a24b76071dca530d14b86e7fc5a98
+  metadata.gz: 63e704bffd2f4016a38b7181d94529b5f05e7c64bb99c853ad5781fe0530b7f4343fdd2a73cd2fa7256cffa933a9750a0ceb54db27bb4d001cdd3adbf6a7c476
+  data.tar.gz: 5c9c24eda6a2c8d9a8c5d30513aeacdd88d45f67cb2bf55b9c712bb13de622f0508f2442690b2b92afff0ddb87136c34cb91e30f8d123af46ae7d80230a20c49

data/.github/workflows/test.yml

@@ -3,6 +3,8 @@ name: Test
 on:
   push:
     branches: [ $default-branch ]
+  pull_request_target:
+    branches: [ $default-branch ]
   pull_request:
 
 env:
@@ -69,7 +71,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [ '2.7', '2.6', '2.5', 'jruby' ]
+        ruby-version: [ '3.0', '2.7', '2.6', 'jruby' ]
         gemfile:
           - 'rails61_gems.rb'
           - 'rails60_gems.rb'
@@ -77,6 +79,12 @@ jobs:
           - 'rails51.gemfile'
           - 'rails50.gemfile'
           - 'rails42.gemfile'
+#        exclude:
+#          - ruby-version: '3.0'
+#            gemfile: 'rails50_gems.rb'
+#          - ruby-version: '3.0'
+#            gemfile: 'rails42_gems.rb'
+
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
 

data/capybara-screenshot-diff.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Track your GUI changes with diff assertions"
   spec.description = "Save screen shots and track changes with graphical diff"
   spec.homepage = "https://github.com/donv/capybara-screenshot-diff"
-  spec.required_ruby_version = "~> 2.5"
+  spec.required_ruby_version = ">= 2.5.0"
   spec.license = "MIT"
   spec.metadata["allowed_push_host"] = "https://rubygems.org/"
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

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

@@ -209,8 +209,8 @@ module Capybara
           def find_left_right_and_top(old_img, new_img, region)
             left = region[0] || old_img.width - 1
             top = region[1]
-            bottom = region[2]
-            right = region[3] || 0
+            right = region[2] || 0
+            bottom = region[3]
             old_img.height.times do |y|
               (0...left).find do |x|
                 next if same_color?(old_img, new_img, x, y)

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

@@ -82,7 +82,7 @@ module Capybara
             @chunky_png_comparator ||= ImageCompare.new(
               @new_file_name,
               @old_file_name,
-              @options.merge(driver: :chunky_png, tolerance: nil, median_filter_window_size: nil)
+              **@options.merge(driver: :chunky_png, tolerance: nil, median_filter_window_size: nil)
             )
           end
 

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

@@ -20,6 +20,16 @@ module Capybara
           }()
         JS
 
+        HIDE_CARET_SCRIPT = <<~JS
+          if (!document.getElementById('csdHideCaretStyle')) {
+            let style = document.createElement('style');
+            style.setAttribute('id', 'csdHideCaretStyle');
+            document.head.appendChild(style);
+            let styleSheet = style.sheet;
+            styleSheet.insertRule("* { caret-color: transparent !important; }", 0);
+          }
+        JS
+
         def take_stable_screenshot(comparison, stability_time_limit:, wait:)
           previous_file_name = comparison.old_file_name
           screenshot_started_at = last_image_change_at = Time.now
@@ -117,15 +127,7 @@ module Capybara
             JS
             blurred_input = page.driver.send :unwrap_script_result, active_element
           end
-          if Capybara::Screenshot.hide_caret && !@hid_caret
-            execute_script(<<~JS)
-              var style = document.createElement('style');
-              document.head.appendChild(style);
-              var styleSheet = style.sheet;
-              styleSheet.insertRule("* { caret-color: transparent !important; }", 0);
-            JS
-            @hid_caret = true
-          end
+          execute_script(HIDE_CARET_SCRIPT) if Capybara::Screenshot.hide_caret
           blurred_input
         end
 

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

@@ -3,7 +3,7 @@
 module Capybara
   module Screenshot
     module Diff
-      VERSION = "1.4.1"
+      VERSION = "1.5.2"
     end
   end
 end

data/lib/capybara/screenshot/diff.rb

@@ -55,6 +55,12 @@ module Capybara
       mattr_accessor(:tolerance) { 0.001 }
 
       AVAILABLE_DRIVERS = Utils.detect_available_drivers.freeze
+      begin
+        require 'minitest'
+        ASSERTION = Minitest::Assertion
+      rescue
+        ASSERTION = RuntimeError
+      end
 
       def self.included(klass)
         klass.include TestMethods
@@ -73,7 +79,7 @@ module Capybara
             test_screenshot_errors = @test_screenshots
               .map { |caller, name, compare| assert_image_not_changed(caller, name, compare) }
             test_screenshot_errors.compact!
-            fail(test_screenshot_errors.join("\n\n")) if test_screenshot_errors.any?
+            raise ASSERTION, test_screenshot_errors.join("\n\n") if test_screenshot_errors.any?
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -115,16 +115,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Track your GUI changes with diff assertions