capybara-screenshot-diff 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de52a07b767a8c00bc3fbb4932c5dc50c3473ad
-  data.tar.gz: 379c7f08576254f37a3a19fd91b51cb3bac25ee5
+  metadata.gz: d1d58c9045025d9f38006f766e9ecfaec712dd2d
+  data.tar.gz: 301b53140c0e2feccf839f4331afdcc8ac3edf3f
 SHA512:
-  metadata.gz: b9ee0511feed3f3bbcde5f6a26ac818ff162ee46867edef1179ea3aa5b63a654a189f3835f545511d6129b82d238a671ce7d369bd4dede4f47741e5d894a924b
-  data.tar.gz: 8d8aead2eae4a347867728293518f8945872f8fbb0b6e56457232c2b83af648918c7ca23cb866222bf4993a4f4bd5e652468d363e3204eda0773501805150ad8
+  metadata.gz: db1b86f92fcb0b5818de4643fd69e3cb69ddd17a403da0b521b97c24f7c0629bcf949195dc1f6c0d760cd7571e84f03a8aa7ca49376d6bb9127f19507021d129
+  data.tar.gz: eab2ca743e989c83f9974811d3e6069387e0b0d55a43135c73d3b11010f7bbfb7873dfc17b778a335cf64201e88024b4e657c5e639cdbaa1463f7427a2d59ec5

data/.rubocop_todo.yml

@@ -8,17 +8,17 @@
 
 # Offense count: 12
 Metrics/AbcSize:
-  Max: 52
+  Max: 55
 
 # Offense count: 1
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 33
+  Max: 43
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 273
+  Max: 283
 
 # Offense count: 6
 Metrics/CyclomaticComplexity:
@@ -27,7 +27,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 16
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 38
+  Max: 48
 
 # Offense count: 1
 # Configuration parameters: CountComments.
@@ -41,7 +41,7 @@ Metrics/ParameterLists:
 
 # Offense count: 6
 Metrics/PerceivedComplexity:
-  Max: 12
+  Max: 15
 
 # Offense count: 2
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.

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

@@ -40,7 +40,7 @@ module Capybara
           old_bytes, new_bytes = load_image_files(@old_file_name, @new_file_name)
           return true if old_bytes == new_bytes
           images = load_images(old_bytes, new_bytes)
-          old_bytes = new_bytes = nil
+          old_bytes = new_bytes = nil # rubocop: disable Lint/UselessAssignment
           crop_images(images, @dimensions) if @dimensions
 
           return false if sizes_changed?(*images)
@@ -91,7 +91,6 @@ module Capybara
           @left, @top, @right, @bottom = find_diff_rectangle(old_img, new_img)
 
           return not_different if @top.nil?
-
           return not_different if @area_size_limit && size <= @area_size_limit
 
           annotated_old_img, annotated_new_img = draw_rectangles(images, @bottom, @left, @right, @top)
@@ -255,18 +254,18 @@ module Capybara
         def same_color?(old_img, new_img, x, y)
           color_distance =
             color_distance_at(new_img, old_img, x, y, shift_distance_limit: @shift_distance_limit)
-          shift_distance =
-            shift_distance_at(new_img, old_img, x, y, color_distance_limit: @color_distance_limit)
           if !@max_color_distance || color_distance > @max_color_distance
             @max_color_distance = color_distance
           end
-          if shift_distance.to_i > @max_shift_distance.to_i
+          color_matches = color_distance == 0 || (@color_distance_limit && @color_distance_limit > 0 &&
+              color_distance <= @color_distance_limit)
+          return color_matches unless @shift_distance_limit
+          shift_distance =
+            shift_distance_at(new_img, old_img, x, y, color_distance_limit: @color_distance_limit)
+          if shift_distance && (@max_shift_distance.nil? || shift_distance > @max_shift_distance)
             @max_shift_distance = shift_distance
           end
-          (color_distance == 0 || (@color_distance_limit && @color_distance_limit > 0 &&
-              color_distance <= @color_distance_limit)) &&
-            (shift_distance == 0 || (@shift_distance_limit && @shift_distance_limit > 0 &&
-                shift_distance <= @shift_distance_limit))
+          color_matches
         end
 
         def color_distance_at(new_img, old_img, x, y, shift_distance_limit:)
@@ -285,8 +284,7 @@ module Capybara
             end
             distances.min
           else
-            new_color = new_img[x, y]
-            ChunkyPNG::Color.euclidean_distance_rgba(org_color, new_color)
+            ChunkyPNG::Color.euclidean_distance_rgba(org_color, new_img[x, y])
           end
         end
 
@@ -337,7 +335,6 @@ module Capybara
             end
             break if bounds_breached == 4
             shift_distance += 1
-            # puts "Bumped shift_distance to #{shift_distance}"
           end
           nil
         end
@@ -346,10 +343,6 @@ module Capybara
           new_color = new_img[dx, dy]
           return new_color == org_color unless color_distance_limit
           color_distance = ChunkyPNG::Color.euclidean_distance_rgba(org_color, new_color)
-          # if color_distance > 0
-          #   puts "color_distance: #{dx} #{dy} #{color_distance} #{color_distance_limit} " \
-          #       "#{color_distance <= color_distance_limit}"
-          # end
           color_distance <= color_distance_limit
         end
       end

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

@@ -108,9 +108,10 @@ module Capybara
                                end
           # ODOT
 
+          max_shift_distance = comparison.max_shift_distance
           "Screenshot does not match for '#{name}' (area: #{comparison.size}px #{comparison.dimensions}" \
             ", max_color_distance: #{max_color_distance}" \
-            ", max_shift_distance: #{comparison.max_shift_distance})\n" \
+            "#{", max_shift_distance: #{max_shift_distance}" if max_shift_distance})\n" \
             "#{comparison.new_file_name}\n#{comparison.annotated_old_file_name}\n" \
             "#{comparison.annotated_new_file_name}\n" \
             "at #{caller}"

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

@@ -3,7 +3,7 @@
 module Capybara
   module Screenshot
     module Diff
-      VERSION = '0.11.1'.freeze
+      VERSION = '0.11.2'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-19 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack