capybara-screenshot-diff 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 604ae93ede2004c5acaadd0ac94aae73bb200e9f
-  data.tar.gz: 987614ec8c0a6a5b2d6c1ebf4645af12671299ce
+  metadata.gz: 31b02395af8b464ceeb774dbf6364497e0127daa
+  data.tar.gz: 2bd199042023db6a41d51e0312fb791d2da0ece6
 SHA512:
-  metadata.gz: c11c1da55ef26edd154478afcbfafa5ac741225527abe2e40fd4dbb255b98295aedab740f3a759d8b6dfce0e99370e24f7adfca77ef0c99afabac59b094ce308
-  data.tar.gz: 15c6a5317ef11703fee0d76fe4d1d607afec3f6c3f0e313afa3ec45826e6e36db2b5c2cd044a2305b5a5651f39194e78213b1a4a645ddb09b6b534510ad9e562
+  metadata.gz: 116bc4c1258f770998f2451ab3abcb124bc4b6926961e4cae7edf3cb32e128d990fed362b18b1226d9c84fdfb92fb88e21bffb5691fe6faf5077884bd1d6e7e9
+  data.tar.gz: a40a2b6e2f471d9762fc0e2cfe8da22ec3a89bf5ccbb0971ef5afb43944386193a3636849281194094c2810e24905a755ede1e3ac700580057d32cc1da02912d

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

@@ -127,8 +127,10 @@ module ActionDispatch
 
       FileUtils.mkdir_p File.dirname(file_name)
       committed_file_name = check_vcs(name, file_name, org_name)
-      take_stable_screenshot(file_name)
-      return unless committed_file_name && File.exist?(committed_file_name)
+      previous_file_exists = committed_file_name && File.exist?(committed_file_name)
+      previous_size = File.size(committed_file_name) if previous_file_exists
+      take_stable_screenshot(file_name, previous_size)
+      return unless previous_file_exists
       (@test_screenshots ||= []) << [caller[0], name, file_name, committed_file_name, new_name, org_name]
     end
 
@@ -182,38 +184,46 @@ EOF
         pending_image = evaluate_script IMAGE_WAIT_SCRIPT
         break unless pending_image
         assert (Time.now - start) < timeout,
-            "Image not loaded after #{timeout}s: #{pending_image.inspect}"
+            "Images not loaded after #{timeout}s: #{pending_image.inspect}"
         sleep 0.1
       end
     end
 
-    def take_stable_screenshot(file_name)
+    def take_stable_screenshot(file_name, original_file_size = nil)
       assert_images_loaded
-      old_file_size = nil
+      old_file_size = original_file_size
+      screeenshot_started_at = last_image_change_at = Time.now
       loop do
         save_screenshot(file_name)
 
-        # FIXME(uwe): Remove when chromedriver take right size screenshots
-        # Reduce Retina image size
-        if self.class.macos? && selenium? && Capybara::Screenshot.window_size
-          saved_image = ChunkyPNG::Image.from_file(file_name)
-          width = Capybara::Screenshot.window_size[0]
-          if saved_image.width >= width * 2
-            height = (width * saved_image.height) / saved_image.width
-            resized_image = saved_image.resample_bilinear(width, height)
-            resized_image.save(file_name)
-          end
-        end
+        # TODO(uwe): Remove when chromedriver take right size screenshots
+        reduce_retina_image_size(file_name)
         # EMXIF
 
         break unless Capybara::Screenshot.stability_time_limit
         new_file_size = File.size(file_name)
-        break if new_file_size == old_file_size
+        break if new_file_size == original_file_size
+        break if new_file_size == old_file_size &&
+            (Time.now - last_image_change_at) > Capybara::Screenshot.stability_time_limit
+        last_image_change_at = Time.now if new_file_size != old_file_size
         old_file_size = new_file_size
-        sleep Capybara::Screenshot.stability_time_limit
+        sleep 0.1
+
+        assert (Time.now - screeenshot_started_at) < Capybara.default_max_wait_time,
+            "Could not get stable screenshot within #{Capybara.default_max_wait_time}s"
       end
     end
 
+    private def reduce_retina_image_size(file_name)
+      return if !self.class.macos? || !selenium? || !Capybara::Screenshot.window_size
+      saved_image = ChunkyPNG::Image.from_file(file_name)
+      width = Capybara::Screenshot.window_size[0]
+      return if saved_image.width < width * 2
+      height = (width * saved_image.height) / saved_image.width
+      resized_image = saved_image.resample_bilinear(width, height)
+      resized_image.save(file_name)
+    end
+
     def assert_image_not_changed(caller, name, file_name, committed_file_name, new_name, org_name)
       if Capybara::Screenshot::Diff::ImageCompare.compare(committed_file_name, file_name,
           Capybara::Screenshot.window_size)

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

@@ -3,7 +3,7 @@
 module Capybara
   module Screenshot
     module Diff
-      VERSION = '0.5.1'.freeze
+      VERSION = '0.5.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.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack