capybara-screenshot-diff 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbd81a7aa63a3fcfada0a1fd3544d83bf807ac00dd2240233dfe23ecfd105591
-  data.tar.gz: '085af6073a2a6908ca4dfa8cb4ef674b0be391f241cea5816e4179bbdcb9e142'
+  metadata.gz: c4b74b3421312a6837944115244ae03eb5b59b65b28dd21fed17ad9f13672b32
+  data.tar.gz: 9d60292db9261447214601ff3e498adb81cb5ce51899db8c19f18ac66ea53d6c
 SHA512:
-  metadata.gz: db56bcc2c8a2cac4be1190994cd481fe91258e9d6991ec2890f793b8d269ee7f7075ed3604603c501ad5412ab12b95124c4814a372e76b42486341f0e7e57e1f
-  data.tar.gz: 421a21ecfb59711a95591a839fa23a1954664b021a634f78801e5b19aaf22520b69741dd4776d1a2a418de803b026487718fb4d05ac9f12c9fde2d6aa5d5d8ad
+  metadata.gz: c529cfbf50e5b11251d4c44115713a99aac84c712dc62770d6cdc735adeba814ffc62e68acaa2fdf8e77fc6171b37269b37fbb2d669915a80a44c4d9ef7a523a
+  data.tar.gz: 9b6f02f0c296a53fca5acba02b36b838bc83ac8616606029f44122a08537b930e122ce1398ec152f2dfc02e65b207042ba24c37f899cb7d6586c2588c6cd60f6

data/.rubocop_todo.yml

@@ -33,7 +33,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 107
+  Max: 109
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.

data/README.md

@@ -409,6 +409,12 @@ The arguments are [x1, y1, x2, y2] for the area you want to ignore.  You can als
 Capybara::Screenshot::Diff.skip_area = [0, 0, 64, 48]
 ```
 
+If you need to ignore multiple areas, you can supply an array of arrays:
+
+```ruby
+screenshot 'index', skip_area: [[0, 0, 64, 48], [17, 6, 27, 16]]
+```
+
 
 ## Development
 

data/lib/capybara/screenshot/diff.rb

@@ -44,6 +44,7 @@ module Capybara
       mattr_accessor :color_distance_limit
       mattr_accessor(:enabled) { true }
       mattr_accessor :shift_distance_limit
+      mattr_accessor :skip_area
 
       def self.included(clas)
         clas.include TestMethods

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

@@ -277,9 +277,8 @@ module Capybara
         end
 
         def same_color?(old_img, new_img, x, y)
-          if @skip_area && @skip_area[0] <= x && x <= @skip_area[2] &&
-              @skip_area[1] <= y && y <= @skip_area[3]
-            return true
+          @skip_area&.each do |skip_start_x, skip_start_y, skip_end_x, skip_end_y|
+            return true if skip_start_x <= x && x <= skip_end_x && skip_start_y <= y && y <= skip_end_y
           end
 
           color_distance =

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

@@ -25,7 +25,7 @@ module Capybara
           blurred_input = prepare_page_for_screenshot
           previous_file_name = comparison.old_file_name
           screenshot_started_at = last_image_change_at = Time.now
-          loop.with_index do |_x, i|
+          1.step do |i|
             take_right_size_screenshot(comparison)
 
             break unless Capybara::Screenshot.stability_time_limit
@@ -118,9 +118,9 @@ module Capybara
         def check_max_wait_time(comparison, screenshot_started_at, shift_distance_limit:)
           shift_factor = shift_distance_limit ? (shift_distance_limit * 2 + 1) ^ 2 : 1
           max_wait_time = Capybara.default_max_wait_time * shift_factor
-          assert (Time.now - screenshot_started_at) < max_wait_time,
+          assert((Time.now - screenshot_started_at) < max_wait_time,
               "Could not get stable screenshot within #{max_wait_time}s\n" \
-                      "#{stabilization_images(comparison.new_file_name).join("\n")}"
+                      "#{stabilization_images(comparison.new_file_name).join("\n")}")
         end
 
         def assert_images_loaded(timeout: Capybara.default_max_wait_time)
@@ -131,8 +131,8 @@ module Capybara
             pending_image = evaluate_script IMAGE_WAIT_SCRIPT
             break unless pending_image
 
-            assert (Time.now - start) < timeout,
-                "Images not loaded after #{timeout}s: #{pending_image.inspect}"
+            assert((Time.now - start) < timeout,
+                "Images not loaded after #{timeout}s: #{pending_image.inspect}")
             sleep 0.1
           end
         end

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

@@ -70,10 +70,12 @@ module Capybara
         # @return [Boolean] wether a screenshot was taken
         def screenshot(name, color_distance_limit: Diff.color_distance_limit,
             shift_distance_limit: Diff.shift_distance_limit, area_size_limit: Diff.area_size_limit,
-            skip_area: nil)
+            skip_area: Diff.skip_area)
           return unless Screenshot.active?
           return if window_size_is_wrong?
 
+          skip_area = skip_area&.flatten&.each_cons(4)&.to_a # Allow nil or single or multiple areas
+
           if @screenshot_counter
             name = "#{format('%02i', @screenshot_counter)}_#{name}"
             @screenshot_counter += 1

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

@@ -3,7 +3,7 @@
 module Capybara
   module Screenshot
     module Diff
-      VERSION = '1.0.2'
+      VERSION = '1.1.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack