capybara-screenshot-diff 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56328c516cec1f21d0a661ed3db8310bc746fcf2
-  data.tar.gz: f32f91bba312988edce7a8115a1bfe370a0b382e
+  metadata.gz: a3b1581dfd6dfe2bc40dfcff8a5414839ed9cffd
+  data.tar.gz: f149dcc7655cdc88216d93de719805ba5369cc96
 SHA512:
-  metadata.gz: 93cc396735044fa6ecfd93cb428445fc7ebe4b94241258731056a89182d0db1ed020b8130e6092e6022f3b64982416dfa78aa61b993379649f83ed060e979c8b
-  data.tar.gz: bba12b95dba9083595e0dc0b6095c657aab5815fed255f78973cdebdc2af3b618227fe5c8950f5622545be576da68953cc19c0b4e99398f097f4ef04be5b9b89
+  metadata.gz: c78deed42053ef6d72df85e3d489b458eac585e363370da2753da56d69cbaded5f04c08e736402aa7bb38bbf5b64e0d7d06c08f7302491c9c77e7a27a2c5cab9
+  data.tar.gz: 15a51febc69814816067a77ba18708e1919e96f286a01794964671a8c55cf38eded0ce35897a0a92b012d7255998d0b34b3ce14e73fb7f0d88f9fe2b1e20ac87

data/.rubocop_todo.yml

@@ -34,7 +34,7 @@ Metrics/MethodLength:
 
 # Offense count: 1
 Metrics/PerceivedComplexity:
-  Max: 8
+  Max: 9
 
 # Offense count: 1
 Performance/Caller:

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

@@ -126,10 +126,10 @@ module ActionDispatch
       file_name = "#{self.class.screenshot_area_abs}/#{name}.png"
 
       FileUtils.mkdir_p File.dirname(file_name)
-      committed_file_name = check_vcs(name, file_name)
-      comparison = Capybara::Screenshot::Diff::ImageCompare.new(committed_file_name, file_name,
+      comparison = Capybara::Screenshot::Diff::ImageCompare.new(file_name,
           dimensions: Capybara::Screenshot.window_size, color_distance_limit: color_distance_limit,
           area_size_limit: area_size_limit)
+      checkout_vcs(name, comparison)
       take_stable_screenshot(comparison)
       return unless comparison.old_file_exists?
       (@test_screenshots ||= []) << [caller[0], name, comparison]
@@ -142,32 +142,30 @@ module ActionDispatch
           Selenium::WebDriver::Dimension.new(*Capybara::Screenshot.window_size)
     end
 
-    private def check_vcs(name, file_name)
+    private def checkout_vcs(name, comparison)
       svn_file_name = "#{self.class.screenshot_area_abs}/.svn/text-base/#{name}.png.svn-base"
       if File.exist?(svn_file_name)
         committed_file_name = svn_file_name
+        FileUtils.cp committed_file_name, comparison.old_file_name
       else
-        svn_info = `svn info #{file_name} #{SILENCE_ERRORS}`
+        svn_info = `svn info #{comparison.new_file_name} #{SILENCE_ERRORS}`
         if svn_info.present?
           wc_root = svn_info.slice(/(?<=Working Copy Root Path: ).*$/)
           checksum = svn_info.slice(/(?<=Checksum: ).*$/)
           if checksum
             committed_file_name = "#{wc_root}/.svn/pristine/#{checksum[0..1]}/#{checksum}.svn-base"
+            FileUtils.cp committed_file_name, comparison.old_file_name
           end
         else
-          committed_file_name = restore_git_revision(name,
-              Capybara::Screenshot::Diff::ImageCompare.annotated_old_file_name(file_name))
+          restore_git_revision(name, comparison.old_file_name)
         end
       end
-      committed_file_name
     end
 
-    private def restore_git_revision(name, org_name)
-      committed_file_name = org_name
-      redirect_target = "#{committed_file_name} #{SILENCE_ERRORS}"
+    private def restore_git_revision(name, target_file_name)
+      redirect_target = "#{target_file_name} #{SILENCE_ERRORS}"
       `git show HEAD~0:./#{self.class.screenshot_area}/#{name}.png > #{redirect_target}`
-      FileUtils.rm_f(committed_file_name) if File.size(committed_file_name) == 0
-      committed_file_name
+      FileUtils.rm_f(target_file_name) unless $CHILD_STATUS == 0
     end
 
     IMAGE_WAIT_SCRIPT = <<EOF.freeze
@@ -194,35 +192,44 @@ EOF
       end
     end
 
-    private def take_stable_screenshot(comparison)
+    private def take_stable_screenshot(comparison) # rubocop: disable Metrics/AbcSize, Metrics/MethodLength
       assert_images_loaded
       if Capybara::Screenshot.blur_active_element
-        input = page.driver.send :unwrap_script_result, execute_script('ae=document.activeElement;if (ae.nodeName == "INPUT"){ae.blur();return ae};return null')
+        active_element =
+          execute_script(<<-JS)
+            ae=document.activeElement
+            if (ae.nodeName == "INPUT" || ae.nodeName == "TEXTAREA"){ae.blur();return ae}
+            return null
+          JS
+        input = page.driver.send :unwrap_script_result, active_element
       end
       previous_file_size = comparison.old_file_size
       screeenshot_started_at = last_image_change_at = Time.now
       loop do
         save_screenshot(comparison.new_file_name)
 
-        # TODO(uwe): Remove when chromedriver take right size screenshots
+        # TODO(uwe): Remove when chromedriver takes right size screenshots
         reduce_retina_image_size(comparison.new_file_name)
         # EMXIF
 
         break unless Capybara::Screenshot.stability_time_limit
         break if comparison.quick_equal?
 
-        if comparison.new_file_size == previous_file_size
-          if (Time.now - last_image_change_at) > Capybara::Screenshot.stability_time_limit
-            break
+        new_file_size = comparison.new_file_size
+        if previous_file_size
+          if new_file_size == previous_file_size
+            if (Time.now - last_image_change_at) > Capybara::Screenshot.stability_time_limit
+              break
+            end
+          else
+            last_image_change_at = Time.now
           end
-        else
-          last_image_change_at = Time.now
-        end
 
-        assert (Time.now - screeenshot_started_at) < Capybara.default_max_wait_time,
-            "Could not get stable screenshot within #{Capybara.default_max_wait_time}s"
+          assert (Time.now - screeenshot_started_at) < Capybara.default_max_wait_time,
+              "Could not get stable screenshot within #{Capybara.default_max_wait_time}s"
+        end
 
-        previous_file_size = comparison.new_file_size
+        previous_file_size = new_file_size
         comparison.reset
       end
     ensure

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

@@ -6,24 +6,17 @@ module Capybara
       class ImageCompare
         include ChunkyPNG::Color
 
-        attr_reader :annotated_new_file_name, :annotated_old_file_name, :new_file_name
+        attr_reader :annotated_new_file_name, :annotated_old_file_name, :new_file_name,
+            :old_file_name
 
-        def self.compare(*args)
-          new(*args).different?
-        end
-
-        def self.annotated_old_file_name(new_file_name)
-          "#{new_file_name.chomp('.png')}_0.png~"
-        end
-
-        def initialize(old_file_name, new_file_name, dimensions: nil, color_distance_limit: nil,
+        def initialize(new_file_name, dimensions: nil, color_distance_limit: nil,
             area_size_limit: nil)
-          @old_file_name = old_file_name
           @new_file_name = new_file_name
           @color_distance_limit = color_distance_limit
           @area_size_limit = area_size_limit
           @dimensions = dimensions
-          @annotated_old_file_name = self.class.annotated_old_file_name(new_file_name)
+          @old_file_name = "#{new_file_name}~"
+          @annotated_old_file_name = "#{new_file_name.chomp('.png')}_0.png~"
           @annotated_new_file_name = "#{new_file_name.chomp('.png')}_1.png~"
           reset
         end
@@ -93,7 +86,7 @@ module Capybara
         end
 
         private def not_different
-          clean_tmp_files(@annotated_old_file_name, @annotated_new_file_name)
+          clean_tmp_files
           false
         end
 
@@ -138,9 +131,11 @@ module Capybara
           new_img.save(new_file_name)
         end
 
-        def clean_tmp_files(old_file_name, new_file_name)
-          File.delete(old_file_name) if File.exist?(old_file_name)
-          File.delete(new_file_name) if File.exist?(new_file_name)
+        def clean_tmp_files
+          FileUtils.cp @old_file_name, @new_file_name
+          File.delete(@old_file_name) if File.exist?(@annotated_old_file_name)
+          File.delete(@annotated_old_file_name) if File.exist?(@annotated_old_file_name)
+          File.delete(@annotated_new_file_name) if File.exist?(@annotated_new_file_name)
         end
 
         def load_images(old_file, new_file)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack