capybara-screenshot-diff 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a36588af46fa270b2ceefd1961ff3d5c1038c19207228d318335bc89bfb25a
-  data.tar.gz: dfc8f5c3e53a90d20a0495aa711de8673f911921ccf8a80f2f65424ea80aba2a
+  metadata.gz: 6fb821dc9a698d71be5e46d2eaff029a6733319a13b6d3430c701ee59a5911f1
+  data.tar.gz: 8072442dd4dd6cd37fb234949da7d495339a1c0ef98077d5256ceb0433419b93
 SHA512:
-  metadata.gz: 297bfe8a02628427201a60a3c3411f10310baa9e6501af8564b8b7b752aabb8f0e6ebd287eb2e8b20e0c8e3818c00badb7ef2978c8b471958fca16fe4b6d1bfd
-  data.tar.gz: 6bd4276e3cf6f1f8a5b2d59eaf8d4121c49c598824463b7112f83f7434d9b744724edf95cd933c3ea2a61e4946926cdfac1b4745536952cbde48ebcb31532be6
+  metadata.gz: 17e51f966295496a2487888cec271bbd6855a0a6d6a6132a618d74778c35ebe0ad7e0cb130be76693bcc23d35c9b7bf0e7c74faa24b3799d634086daaca489aa
+  data.tar.gz: bce762966d63a50dc04b5e7e3ffde8ad79d0d73cc7e9c817f194c7d8bb50b3d41f6dabb1e8d8973296dada8b15e051bc31492bf82a3fd78e2b65e0f1622404d6

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

@@ -127,10 +127,10 @@ module Capybara
           @skip_area.to_a.flatten.each_slice(4) do |region|
             annotated_images = driver.draw_rectangles(annotated_images, region, SKIP_COLOR)
           end
-          save(*annotated_images, @annotated_new_file_name, @annotated_old_file_name)
+          save(*annotated_images, @annotated_old_file_name, @annotated_new_file_name)
         end
 
-        def save(new_img, old_img, annotated_new_file_name, annotated_old_file_name)
+        def save(old_img, new_img, annotated_old_file_name, annotated_new_file_name)
           driver.save_image_to(old_img, annotated_old_file_name)
           driver.save_image_to(new_img, annotated_new_file_name)
         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.0"
+      VERSION = "1.5.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-08-24 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