capybara-screenshot-diff 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2c578a6c17c416b415a2b9962acd2143475c1f6
-  data.tar.gz: cdf95fc4a8478c7034b6c42da6b2c0243c449b12
+  metadata.gz: 604ae93ede2004c5acaadd0ac94aae73bb200e9f
+  data.tar.gz: 987614ec8c0a6a5b2d6c1ebf4645af12671299ce
 SHA512:
-  metadata.gz: 93d2c8284049415f00e368b50089e6a406047aa178f7ba9c979962d15cb8a6b3d005170cd2ba162ec8c572eee56521e4f33710f4d2c2a1bf6231a3579f174cbe
-  data.tar.gz: 0c5a82e828f86294d1d77cbcbf41710b922fd10918e6dd2d37fde681ead14e07cf28ffc392c9adfcd048ed04572462227016273520d161e8a671cd2a81045b6d
+  metadata.gz: c11c1da55ef26edd154478afcbfafa5ac741225527abe2e40fd4dbb255b98295aedab740f3a759d8b6dfce0e99370e24f7adfca77ef0c99afabac59b094ce308
+  data.tar.gz: 15c6a5317ef11703fee0d76fe4d1d607afec3f6c3f0e313afa3ec45826e6e36db2b5c2cd044a2305b5a5651f39194e78213b1a4a645ddb09b6b534510ad9e562

data/.rubocop.yml

@@ -1,6 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 2.2
   DisplayCopNames: true
   DisplayStyleGuide: true
 

data/.rubocop_todo.yml

@@ -6,21 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'capybara-screenshot-diff.gemspec'
-    - 'lib/capybara/screenshot/diff/version.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
-  Exclude:
-    - 'lib/capybara/screenshot/diff/capybara_setup.rb'
-
 # Offense count: 4
 Metrics/AbcSize:
   Max: 31
@@ -53,11 +38,3 @@ Performance/Caller:
 Security/YAMLLoad:
   Exclude:
     - 'matrix_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: format, sprintf, percent
-Style/FormatString:
-  Exclude:
-    - 'lib/capybara/screenshot/diff/capybara_setup.rb'

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
   - jruby-9.1.8.0
   - ruby-2.3.4
   - ruby-2.2.7
-  - ruby-2.1.9
   - ruby-head
   - jruby-head
 
@@ -19,9 +18,6 @@ jdk:
   - oraclejdk8
 
 matrix:
-  exclude:
-    - rvm: ruby-2.1.9 # Not supported by Rails 5
-      gemfile: gemfiles/rails50.gemfile
   allow_failures:
     - rvm: jruby-head # FIXME: (uwe) Low coverage: https://github.com/jruby/jruby/issues/4404
       gemfile: gemfiles/rails50.gemfile

data/capybara-screenshot-diff.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'capybara/screenshot/diff/version'

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

@@ -85,7 +85,10 @@ module ActionDispatch
     setup do
       if Capybara::Screenshot.window_size
         if selenium?
-          page.driver.browser.manage.window.resize_to(*Capybara::Screenshot.window_size)
+          # TODO(uwe): Enable for Chrome and non-windows when it works)
+          if !page.driver.chrome? || ON_WINDOWS
+            page.driver.browser.manage.window.resize_to(*Capybara::Screenshot.window_size)
+          end
         elsif poltergeist?
           page.driver.resize(*Capybara::Screenshot.window_size)
         end
@@ -112,12 +115,9 @@ module ActionDispatch
 
     def screenshot(name)
       return unless Capybara::Screenshot.active?
-      if selenium? && Capybara::Screenshot.window_size
-        return unless page.driver.browser.manage.window.size ==
-            Selenium::WebDriver::Dimension.new(*Capybara::Screenshot.window_size)
-      end
+      return if window_size_is_wrong?
       if @screenshot_counter
-        name = "#{'%02i' % @screenshot_counter}_#{name}"
+        name = "#{format('%02i', @screenshot_counter)}_#{name}"
         @screenshot_counter += 1
       end
       name = full_name(name)
@@ -132,6 +132,13 @@ module ActionDispatch
       (@test_screenshots ||= []) << [caller[0], name, file_name, committed_file_name, new_name, org_name]
     end
 
+    private def window_size_is_wrong?
+      selenium? && Capybara::Screenshot.window_size &&
+        (!page.driver.chrome? || ON_WINDOWS) && # TODO(uwe): Allow for Chrome when it works
+        page.driver.browser.manage.window.size !=
+          Selenium::WebDriver::Dimension.new(*Capybara::Screenshot.window_size)
+    end
+
     def check_vcs(name, file_name, org_name)
       svn_file_name = "#{self.class.screenshot_area_abs}/.svn/text-base/#{name}.png.svn-base"
       if File.exist?(svn_file_name)

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

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 module Capybara
   module Screenshot
     module Diff
-      VERSION = '0.5.0'.freeze
+      VERSION = '0.5.1'.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.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack