capybara-screenshot-diff 0.15.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b36c962b23a2af28438bdfa5246f2f9bf612c705929bd57d3bdf023183e64317
-  data.tar.gz: e5bd86681099718612bf44099acb1cfdf958d906830f3a1059d3910915b34571
+  metadata.gz: 1ed4cf559968821a2689708d36fe556f97b9f0c730a09ab39ca05f1b991ca8ea
+  data.tar.gz: 4749b6bec782a95edd8fe51ec6d216c505fb0b606769738cb0192f37480c67c8
 SHA512:
-  metadata.gz: bc296fd709ccd6a931cf2fc7de0e893ac084216b6c8fe1c8018e50e8ce1e716355f19db5cbaba457797db5e18f7a757561317b8c26a7967d118c3afd5ecaf680
-  data.tar.gz: 03e5c3b3a7351275d1472361cc0cb7cb705b7bf94abe61ac0f41dd27faf495a2e53c2f5085243d1ac598e8660fb0d74bd974e558289d1f1e469fe10a43789b1b
+  metadata.gz: 2ce1837fa5049d423afad82daa6b0c589d1cf2670da9268584b9c16ce589abb7a91fd4d11601c0639037da102754e8a5696d9e143949074354f70ffca38e8499
+  data.tar.gz: 1d3df4ef083b2980e31f59d15b783c9fd26474a1a550f5c8c4d5405abf523bab798b0f21fa246c2b872053dddf79d72c21bb52d412aaa8b40fd6fb23dfca2b96

data/.rubocop.yml

@@ -1,12 +1,17 @@
 inherit_from: .rubocop_todo.yml
+require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
   DisplayCopNames: true
   DisplayStyleGuide: true
   Exclude:
     - gemfiles/vendor/**/*
 
+Layout/AlignArguments:
+  EnforcedStyle: with_fixed_indentation
+  IndentationWidth: 4
+
 Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
   IndentationWidth: 4

data/.travis.yml

@@ -2,12 +2,15 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - jruby-9.2.0.0
-  - ruby-2.5.1
-  - ruby-2.4.4
-  - ruby-2.3.7
+  - jruby-9.2.7.0
+  - ruby-2.6.3
+  - ruby-2.5.5
+  - ruby-2.4.6
+  - ruby-2.3.8
+  - truffleruby-1.0.0-rc16
 
 gemfile:
+  - gemfiles/rails60.gemfile
   - gemfiles/rails52.gemfile
   - gemfiles/rails51.gemfile
   - gemfiles/rails50.gemfile
@@ -19,7 +22,12 @@ env:
 jdk:
   - oraclejdk8
 
-# FIXME(uwe): Remove when fixed: https://github.com/travis-ci/travis-ci/issues/9383
-before_install:
-  - gem install bundler
-# EMXIF
+matrix:
+  fast_finish: true
+  exclude:
+    - rvm: ruby-2.4.6
+      gemfile: gemfiles/rails60.gemfile
+    - rvm: ruby-2.3.8
+      gemfile: gemfiles/rails60.gemfile
+  allow_failures:
+    - rvm: truffleruby-1.0.0-rc16

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in capybara-screenshot-diff.gemspec

data/README.md

@@ -12,11 +12,11 @@ taking screen shots and comparing them to the previous revision.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add these lines to your application's Gemfile:
 
 ```ruby
 gem 'capybara-screenshot-diff'
-gem 'oily_png', platform :ruby
+gem 'oily_png', platform: :ruby
 ```
 
 And then execute:
@@ -145,7 +145,7 @@ end
 test 'my subfeature' do
   screenshot_group 'subfeature'
   visit '/feature'
-  click_button 'Interresting button'
+  click_button 'Interesting button'
   screenshot 'subfeature_index'
   click_button 'Perform action'
   screenshot 'action_performed'

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'capybara/screenshot/diff'

data/capybara-screenshot-diff.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'capybara/screenshot/diff/version'
@@ -10,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Track your GUI changes with diff assertions'
   spec.description   = 'Save screen shots and track changes with graphical diff'
   spec.homepage      = 'https://github.com/donv/capybara-screenshot-diff'
-  spec.required_ruby_version = '~> 2.2'
+  spec.required_ruby_version = '~> 2.3'
   spec.license = 'MIT'
   spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -18,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'actionpack', '>= 4.2', '< 5.3'
+  spec.add_runtime_dependency 'actionpack', '>= 4.2', '< 7'
   spec.add_runtime_dependency 'capybara', '>= 2', '< 4'
   spec.add_runtime_dependency 'chunky_png', '~> 1.3'
 
@@ -27,5 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop', '~> 0.54'
+  spec.add_development_dependency 'rubocop-performance', '~> 0.0'
   spec.add_development_dependency 'simplecov', '~> 0.11'
 end

data/gemfiles/common.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'capybara', '~> 2.0'
@@ -6,4 +8,5 @@ gem 'minitest', '~> 5.0'
 gem 'minitest-reporters'
 gem 'rake'
 gem 'rubocop', '~> 0.39'
+gem 'rubocop-performance', '~> 0.0'
 gem 'simplecov', '~> 0.11'

data/gemfiles/rails42.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 eval File.read("#{__dir__}/common.gemfile")
 
 gem 'actionpack', '~>4.2.7'

data/gemfiles/rails50.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 eval File.read("#{__dir__}/common.gemfile")
 
 gem 'actionpack', '~>5.0.1'

data/gemfiles/rails51.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 eval File.read("#{__dir__}/common.gemfile")
 
 gem 'actionpack', '~>5.1.2'

data/gemfiles/rails52.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 eval File.read("#{__dir__}/common.gemfile")
 
 gem 'actionpack', '~>5.2.1'

data/gemfiles/rails60.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+eval File.read("#{__dir__}/common.gemfile")
+
+gem 'actionpack', '~>6.0.0.rc1'

data/lib/capybara/screenshot/diff.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'capybara/dsl'
 require 'capybara/screenshot/diff/version'
 require 'capybara/screenshot/diff/image_compare'
@@ -29,7 +31,7 @@ module Capybara
       end
 
       def screenshot_area_abs
-        "#{root}/#{screenshot_area}".freeze
+        "#{root}/#{screenshot_area}"
       end
     end
 
@@ -58,7 +60,7 @@ module Capybara
         clas.teardown do
           if Capybara::Screenshot::Diff.enabled && @test_screenshots
             test_screenshot_errors = @test_screenshots
-              .map { |caller, name, compare| assert_image_not_changed(caller, name, compare) }.compact
+              .map { |caller, name, compare| assert_image_not_changed(caller, name, compare) }.compact!
             fail(test_screenshot_errors.join("\n\n")) if test_screenshot_errors.any?
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'chunky_png'
 
 module Capybara

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Capybara
   module Screenshot
     module Os

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'os'
 
 module Capybara
@@ -58,7 +60,7 @@ module Capybara
             FileUtils.mv comparison.new_file_name, previous_file_name
           end
         ensure
-          blurred_input.click if blurred_input
+          blurred_input&.click
         end
 
         private

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'English'
 require 'capybara'
 require 'action_controller'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'os'
 module Capybara
   module Screenshot

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

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

data/matrix_test.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby -w
+# frozen_string_literal: true
 
 system('rubocop --auto-correct') || exit(1)
 
@@ -15,21 +16,27 @@ def run_script(ruby, env, gemfile)
   puts "Testing #{ruby} #{gemfile} #{env}"
   puts
   system("chruby-exec #{ruby} -- bundle exec rake") || exit(1)
+  puts "Testing #{ruby} #{gemfile} OK"
   puts '*' * 80
 end
 
 def use_gemfile(ruby, gemfile, update_gemfiles)
   puts '$' * 80
-  puts "Testing #{gemfile}"
-  puts
   ENV['BUNDLE_GEMFILE'] = gemfile
+
+  bundler_version = `grep -A1 "BUNDLED WITH" #{gemfile}.lock | tail -n 1`
+  bundler_version = '~> 2.0' if bundler_version.strip.empty?
+
+  version_arg = "-v '#{bundler_version}'"
+  bundler_gem_check_cmd = "chruby-exec #{ruby} -- gem query -i -n bundler #{version_arg} >/dev/null"
+  system "#{bundler_gem_check_cmd} || chruby-exec #{ruby} -- gem install #{version_arg} bundler" || exit(1)
+
   if update_gemfiles
     system "chruby-exec #{ruby} -- bundle update"
   else
-    system "chruby-exec #{ruby} -- bundle check || chruby-exec #{ruby} -- bundle install"
+    system "chruby-exec #{ruby} -- bundle check >/dev/null || chruby-exec #{ruby} -- bundle install"
   end || exit(1)
   yield
-  puts "Testing #{gemfile} OK"
   puts '$' * 80
 end
 
@@ -40,12 +47,10 @@ travis['rvm'].each do |ruby|
   puts "Testing #{ruby}"
   puts
   system "ruby-install --no-reinstall #{ruby}" || exit(1)
-  bundler_gem_check_cmd = "chruby-exec #{ruby} -- gem query -i -n bundler >/dev/null"
-  system "#{bundler_gem_check_cmd} || chruby-exec #{ruby} -- gem install bundler" || exit(1)
   travis['gemfile'].each do |gemfile|
     if travis['matrix'] &&
-        (travis['matrix']['exclude'].to_a + travis['matrix']['allowed_failures'].to_a)
-            .any? { |f| f['rvm'] == ruby && f['gemfile'] == gemfile }
+        (travis['matrix']['exclude'].to_a + travis['matrix']['allow_failures'].to_a)
+            .any? { |f| f['rvm'] == ruby && (f['gemfile'].nil? || f['gemfile'] == gemfile) }
       puts 'Skipping known failure.'
       next
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.54'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +186,7 @@ files:
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
 - lib/capybara/screenshot/diff.rb
 - lib/capybara/screenshot/diff/image_compare.rb
 - lib/capybara/screenshot/diff/os.rb
@@ -193,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="