percy-capybara 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c4cebeea7c67b0a6fbd86628017792847e7ba8a
-  data.tar.gz: bcdefb57b54838500ab9c849b3b4a25910114d8e
+  metadata.gz: 58f05b4af92c2331c4f96ea61734cb56240a847f
+  data.tar.gz: ecb08a90a16eb404f2815c849162ff467935560e
 SHA512:
-  metadata.gz: 72d5dc24fa6e916e0eb2f7986841a7575661707929f2a31abe15cf8451e6848b604c8a3aee09a942d92e1d9dac06ddf8208af501ff7c447d8f4f470954f76dbc
-  data.tar.gz: fb152dd45ec55df52ee62c28610e0d5fd5cb8e9a708f06ecc1fbc5483b38a7472af85341d0cc391a0388905615d383b1d140922c243d962006d4152e791cc5e4
+  metadata.gz: db7827c87c482dab2e0a1e8852ba3c7d67f60d87954e799ceb1eb3001d7bbb09a54da74a7f18cd6e46686f0f9fefbec47820470c581cbc96d8c91d5634896c5a
+  data.tar.gz: 27ad4037efaae00d19654a9409992e08297864eac2bdd3482502f676e48480744a644c1b8f169e7fc274e958a004d3a25249556ca31e69eabc1498d66c1330f8

data/.rubocop.yml

@@ -1,92 +1,14 @@
-require: rubocop-rspec
-inherit_from: .rubocop_todo.yml
-AllCops:
-  Include:
-    - Rakefile
-    - lib/**/*.rake
-
-Lint/EndAlignment:
-  EnforcedStyleAlignWith: variable
-
-Metrics/LineLength:
-  Max: 100
-
-Style/CaseIndentation:
-  EnforcedStyle: end
-
-Style/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
-Style/Documentation:
-  Enabled: false
-
-Style/DoubleNegation:
-  Enabled: false
-
-Style/IndentArray:
-  EnforcedStyle: consistent
-
-Style/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-Style/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
-# Disable Style/NumericLiterals so numbers don't need underscores
-Style/NumericLiterals:
-  Enabled: false
-
-Style/NumericPredicate:
-  EnforcedStyle: comparison
-
-Style/RedundantBegin:
-  Enabled: false
+inherit_gem:
+  percy-style:
+    - default.yml
 
-Style/RegexpLiteral:
-  EnforcedStyle: slashes
-  AllowInnerSlashes: true
 
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: consistent_comma
-
-Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-
-RSpec/MessageSpies:
-  EnforcedStyle: receive
-
-RSpec/ExampleLength:
-  Enabled: false
-
-Style/FileName:
-  Exclude:
-    - 'Gemfile'
-    - 'Guardfile'
-    - 'percy-capybara.gemspec'
-
-Style/EmptyLineAfterMagicComment:
+RSpec/InstanceVariable:
   Exclude:
-    - 'percy-capybara.gemspec'
+    - spec/lib/percy/capybara_spec.rb
 
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'percy-capybara.gemspec'
-
-Style/UnneededPercentQ:
-  Exclude:
-    - 'percy-capybara.gemspec'
-
-Style/RegexpLiteral:
-  Exclude:
-    - 'percy-capybara.gemspec'
-
-Style/SymbolArray:
-  Exclude:
-    - 'spec/spec_helper.rb'
+RSpec/ContextWording:
+  Enabled: false
 
-# Will be able to do this in >= v1.11
-# RSpec/DescribedClass:
-#   EnforcedStyle: explicit
+AllCops:
+  TargetRubyVersion: 2.1

data/Gemfile

@@ -8,11 +8,6 @@ gem 'guard-rspec', require: false
 # (for development)
 # gem 'percy-client', path: '~/src/percy-client'
 
-group :test do
-  gem 'rubocop', '~> 0.48.0'
-  gem 'rubocop-rspec'
-end
-
 group :test, :development do
   gem 'pry'
 end

data/lib/percy/capybara/client.rb

@@ -34,7 +34,7 @@ module Percy
         @client = options[:client] || \
           Percy.client(client_info: _client_info, environment_info: _environment_info)
 
-        return unless defined?(Rails)
+        return unless defined?(Rails) && defined?(Sprockets::Rails)
 
         @sprockets_environment = options[:sprockets_environment] || Rails.application.assets
         @sprockets_options = options[:sprockets_options] || Rails.application.config.assets

data/lib/percy/capybara/client/user_agent.rb

@@ -13,7 +13,7 @@ module Percy
             "sinatra/#{_sinatra_version}",
             "ember-cli-rails/#{_ember_cli_rails_version}",
           ].reject do |info|
-            info =~ %r{\/$} # reject if version is empty
+            info =~ /\/$/ # reject if version is empty
           end.join('; ')
         end
 

data/lib/percy/capybara/httpfetcher.rb

@@ -4,7 +4,7 @@ require 'shellwords'
 module Percy
   module Capybara
     module HttpFetcher
-      class Response < Struct.new(:body, :content_type); end
+      Response = Struct.new(:body, :content_type)
 
       def self.fetch(url)
         tempfile = Tempfile.new('percy-capybara-fetch')

data/lib/percy/capybara/loaders/native_loader.rb

@@ -8,8 +8,8 @@ module Percy
       # Resource loader that uses the native Capybara browser interface to discover resources.
       # This loader uses JavaScript to discover page resources, so specs must be tagged with
       # "js: true" because the default Rack::Test driver does not support executing JavaScript.
-      class NativeLoader < BaseLoader # rubocop:disable ClassLength
-        PATH_REGEX = %r{\A/[^\\s\"']*}
+      class NativeLoader < BaseLoader
+        PATH_REGEX = /\A\/[^\\s\"']*/
         DATA_URL_REGEX = /\Adata:/
         LOCAL_HOSTNAMES = [
           'localhost',

data/lib/percy/capybara/loaders/sprockets_loader.rb

@@ -2,7 +2,7 @@ require 'percy/capybara/loaders/base_loader'
 require 'digest'
 require 'find'
 require 'set'
-require 'uri'
+require 'addressable/uri'
 
 module Percy
   module Capybara
@@ -52,7 +52,7 @@ module Percy
               # TODO: more robust support for Sprockets usage outside Rails, ie Sinatra.
               # How do we find the correct path in that case?
               path = sprockets_options.digest ? asset.digest_path : logical_path
-              resource_url = URI.escape("/assets/#{path}")
+              resource_url = Addressable::URI.escape("/assets/#{path}")
             end
 
             next if SKIP_RESOURCE_EXTENSIONS.include?(File.extname(resource_url))

data/lib/percy/capybara/version.rb

@@ -1,5 +1,5 @@
 module Percy
   module Capybara
-    VERSION = '3.1.1'.freeze
+    VERSION = '3.1.2'.freeze
   end
 end

data/percy-capybara.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'percy-client', '~> 1.13'
+  spec.add_dependency 'addressable', '~> 2'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -29,5 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '~> 1'
   spec.add_development_dependency 'mime-types', '< 3' # For Ruby 1.9 testing support.
   spec.add_development_dependency 'faraday', '>= 0.8'
+  spec.add_development_dependency 'httpclient', '~> 2.8'
   spec.add_development_dependency 'sprockets', '>= 3.2.0'
+  spec.add_development_dependency 'percy-style'
 end

data/spec/lib/percy/capybara/client/builds_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Percy::Capybara::Client::Builds do
   end
 
   describe '#initialize_build', type: :feature, js: true do
-    before { setup_sprockets(capybara_client) }
+    before(:each) { setup_sprockets(capybara_client) }
 
     context 'percy is not enabled' do
       let(:enabled) { false }
@@ -152,7 +152,7 @@ RSpec.describe Percy::Capybara::Client::Builds do
     end
   end
   describe '#_upload_missing_build_resources', type: :feature, js: true do
-    before { setup_sprockets(capybara_client) }
+    before(:each) { setup_sprockets(capybara_client) }
 
     it 'returns 0 if there are no missing build resources to upload' do
       mock_response = {

data/spec/lib/percy/capybara/client/rails_public_test_data/symlink_to_images

@@ -0,0 +1 @@
+spec/lib/percy/capybara/client/rails_public_test_data/../symlink_test_data

data/spec/lib/percy/capybara/client/snapshots_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Percy::Capybara::Client::Snapshots, type: :feature do
         }
       end
 
-      before do
+      before(:each) do
         setup_sprockets(capybara_client)
 
         visit '/'

data/spec/lib/percy/capybara/client/user_agent_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Percy::Capybara::Client::UserAgent do
     end
 
     context 'a loader is configured' do
-      before { client.loader = :sprockets_loader }
+      before(:each) { client.loader = :sprockets_loader }
 
       it 'includes loader information' do
         expect(environment_info).to eq('percy-capybara-loader/sprockets_loader')

data/spec/lib/percy/capybara/client_spec.rb

@@ -1,8 +1,8 @@
 RSpec.describe Percy::Capybara::Client do
   describe '#enabled?' do
     context 'when required environment variables set' do
-      before { set_required_env_variables }
-      after { clear_percy_env_variables }
+      before(:each) { set_required_env_variables }
+      after(:each) { clear_percy_env_variables }
 
       it 'is true when PERCY_ENABLE is 1' do
         ENV['PERCY_ENABLE'] = '1'
@@ -26,7 +26,7 @@ RSpec.describe Percy::Capybara::Client do
     end
 
     context 'when required environment variables not set' do
-      before { clear_percy_env_variables }
+      before(:each) { clear_percy_env_variables }
 
       it 'is false' do
         ENV.delete 'PERCY_ENABLE'
@@ -114,6 +114,62 @@ RSpec.describe Percy::Capybara::Client do
     it 'passes client info down to the lower level Percy client' do
       expect(capybara_client.client.client_info).to eq("percy-capybara/#{Percy::Capybara::VERSION}")
     end
+
+    context 'when Rails and Sprockets::Rails is defined' do
+      let(:environment) { double('environment') }
+      let(:options) { double('options') }
+
+      before(:each) do
+        rails = double(version: 5)
+
+        stub_const('Sprockets::Rails', double)
+        stub_const('Rails', rails)
+
+        allow(rails).to receive(:application) do
+          double(
+            assets: environment,
+            config: double(assets: options),
+          )
+        end
+      end
+
+      it 'assigns sprockets_environment to Rails.application.assets' do
+        expect(capybara_client.sprockets_environment).to eq environment
+      end
+
+      it 'assigns sprockets_options to Rails.application.config.assets' do
+        expect(capybara_client.sprockets_options).to eq options
+      end
+
+      context 'when sprockets_environment is passed' do
+        let(:passed_environment) { double('passed-environment') }
+        let(:capybara_client) do
+          Percy::Capybara::Client.new(
+            sprockets_environment: passed_environment,
+          )
+        end
+
+        it 'assigns sprockets_environment to the passed environment' do
+          expect(capybara_client.sprockets_environment).to eq passed_environment
+        end
+      end
+
+      context 'when sprockets_options is passed' do
+        let(:passed_options) { double('passed-options') }
+        let(:capybara_client) { Percy::Capybara::Client.new(sprockets_options: passed_options) }
+
+        it 'assigns sprockets_options to the passed options' do
+          expect(capybara_client.sprockets_options).to eq passed_options
+        end
+      end
+    end
+
+    context 'when Rails or Sprockets::Rails is not defined' do
+      it 'does not assign sprockets_environment or sprockets_options' do
+        expect(capybara_client.sprockets_environment).to_not be
+        expect(capybara_client.sprockets_options).to_not be
+      end
+    end
   end
 
   describe '#initialize_loader' do

data/spec/lib/percy/capybara/loaders/base_loader_spec.rb

@@ -7,13 +7,13 @@ class RackAppWithIframe
 end
 
 RSpec.describe Percy::Capybara::Loaders::BaseLoader do
-  let(:loader) { described_class.new }
+  let(:loader) { Percy::Capybara::Loaders::BaseLoader.new }
 
   describe '#root_html_resource', type: :feature, js: true do
     it 'includes the root DOM HTML' do
       visit '/'
 
-      loader = described_class.new(page: page)
+      loader = Percy::Capybara::Loaders::BaseLoader.new(page: page)
       resource = loader.root_html_resource
 
       expect(resource.is_root).to be_truthy
@@ -27,7 +27,7 @@ RSpec.describe Percy::Capybara::Loaders::BaseLoader do
     it 'excludes the iframe by default' do
       visit '/test-iframe.html'
 
-      loader = described_class.new(page: page)
+      loader = Percy::Capybara::Loaders::BaseLoader.new(page: page)
       resources = loader.iframes_resources
       expect(resources).to eq([])
     end
@@ -35,7 +35,7 @@ RSpec.describe Percy::Capybara::Loaders::BaseLoader do
     it 'includes the iframe with DOM HTML when include_iframes true' do
       visit '/test-iframe.html'
 
-      loader = described_class.new(page: page, include_iframes: true)
+      loader = Percy::Capybara::Loaders::BaseLoader.new(page: page, include_iframes: true)
       resources = loader.iframes_resources
 
       expect(resources.size).to eq(1) # doesn't include iframe to remote host
@@ -49,7 +49,7 @@ RSpec.describe Percy::Capybara::Loaders::BaseLoader do
 
       expect(page).to receive(:within_frame).twice
         .and_raise(Capybara::Poltergeist::FrameNotFound, 'Hi')
-      loader = described_class.new(page: page, include_iframes: true)
+      loader = Percy::Capybara::Loaders::BaseLoader.new(page: page, include_iframes: true)
       resources = loader.iframes_resources
       expect(resources.size).to eq(0)
     end
@@ -58,7 +58,7 @@ RSpec.describe Percy::Capybara::Loaders::BaseLoader do
 
       expect(page).to receive(:within_frame).twice
         .and_raise(Capybara::Poltergeist::TimeoutError, 'Hi')
-      loader = described_class.new(page: page, include_iframes: true)
+      loader = Percy::Capybara::Loaders::BaseLoader.new(page: page, include_iframes: true)
       resources = loader.iframes_resources
       expect(resources.size).to eq(0)
     end
@@ -78,36 +78,36 @@ RSpec.describe Percy::Capybara::Loaders::BaseLoader do
       page_double = double('page')
 
       expect(page_double).to receive(:current_url).and_return('/')
-      loader = described_class.new(page: page_double)
+      loader = Percy::Capybara::Loaders::BaseLoader.new(page: page_double)
       expect(loader.current_path).to eq('/')
 
       expect(page_double).to receive(:current_url).and_return('/test')
-      loader = described_class.new(page: page_double)
+      loader = Percy::Capybara::Loaders::BaseLoader.new(page: page_double)
       expect(loader.current_path).to eq('/test')
 
       expect(page_double).to receive(:current_url).and_return('/test/a')
-      loader = described_class.new(page: page_double)
+      loader = Percy::Capybara::Loaders::BaseLoader.new(page: page_double)
       expect(loader.current_path).to eq('/test/a')
 
       # Rack::Test returns a full example.com URL, so we want to make sure it is stripped:
       expect(page_double).to receive(:current_url).and_return('http://www.example.com/')
-      loader = described_class.new(page: page_double)
+      loader = Percy::Capybara::Loaders::BaseLoader.new(page: page_double)
       expect(loader.current_path).to eq('/')
 
       expect(page_double).to receive(:current_url).and_return('about:srcdoc')
-      loader = described_class.new(page: page_double)
+      loader = Percy::Capybara::Loaders::BaseLoader.new(page: page_double)
       expect(loader.current_path).to eq('/about:srcdoc')
     end
   end
 
   context 'Rack::Test', type: :feature do
-    before { Capybara.app = RackAppWithIframe }
-    after { Capybara.app = nil }
+    before(:each) { Capybara.app = RackAppWithIframe }
+    after(:each) { Capybara.app = nil }
 
     describe '#iframes_resources' do
       it 'is silently ignored' do
         visit '/test-iframe.html'
-        loader = described_class.new(page: page)
+        loader = Percy::Capybara::Loaders::BaseLoader.new(page: page)
         expect(loader.iframes_resources).to eq([])
       end
     end
@@ -115,7 +115,8 @@ RSpec.describe Percy::Capybara::Loaders::BaseLoader do
 
   describe '#_uri_join' do
     it 'joins files into a uri' do
-      expect(described_class.new.send(:_uri_join, 'foo/', '/bar', 'baz')).to eq('foo/bar/baz')
+      expect(Percy::Capybara::Loaders::BaseLoader.new.send(:_uri_join, 'foo/', '/bar', 'baz'))
+        .to eq('foo/bar/baz')
     end
   end
 end

data/spec/lib/percy/capybara/loaders/ember_cli_rails_loader_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Percy::Capybara::Loaders::EmberCliRailsLoader do
   end
 
   let(:loader) do
-    described_class.new(
+    Percy::Capybara::Loaders::EmberCliRailsLoader.new(
       mounted_apps,
       sprockets_environment: environment,
       sprockets_options: sprockets_options,
@@ -23,7 +23,7 @@ RSpec.describe Percy::Capybara::Loaders::EmberCliRailsLoader do
     options = instance_double('options')
     # Set specific files we want to compile. In normal use, this would be all asset files.
     # For this test we just use .svg files
-    precompile_list = [%r{(?:/|\\|\A)\.svg}]
+    precompile_list = [/(?:\/|\\|\A)\.svg/]
     allow(options).to receive(:precompile).and_return(precompile_list)
     allow(options).to receive(:digest).and_return(digest_enabled)
     options
@@ -32,7 +32,7 @@ RSpec.describe Percy::Capybara::Loaders::EmberCliRailsLoader do
   describe 'initialize' do
     context 'all args supplied' do
       it 'successfully initializes' do
-        expect { loader }.not_to raise_error
+        expect { loader }.to_not raise_error
       end
     end
 
@@ -54,12 +54,15 @@ RSpec.describe Percy::Capybara::Loaders::EmberCliRailsLoader do
       let(:mount_path) { mounted_apps.values.first }
       let(:dist_dir) { File.join(assets_dir, 'ember-cli', ember_app.to_s) }
       let(:loader) do
-        described_class.new(mounted_apps, sprockets_environment: environment,
-                                          sprockets_options: sprockets_options,)
+        Percy::Capybara::Loaders::EmberCliRailsLoader.new(
+          mounted_apps,
+          sprockets_environment: environment,
+          sprockets_options: sprockets_options,
+        )
       end
 
       context "called '#{ember_app}' and mounted at '#{mount_path}'" do
-        before do
+        before(:each) do
           allow(loader).to receive(:_dist_path_for_app).and_return(dist_dir)
         end
 

data/spec/lib/percy/capybara/loaders/filesystem_loader_spec.rb

@@ -2,7 +2,13 @@ RSpec.describe Percy::Capybara::Loaders::FilesystemLoader do
   let(:fake_page) { OpenStruct.new(current_url: 'http://localhost/foo') }
   let(:assets_dir) { File.expand_path('../../client/test_data', __FILE__) }
   let(:base_url) { '/url-prefix/' }
-  let(:loader) { described_class.new(base_url: base_url, assets_dir: assets_dir, page: fake_page) }
+  let(:loader) do
+    Percy::Capybara::Loaders::FilesystemLoader.new(
+      base_url: base_url,
+      assets_dir: assets_dir,
+      page: fake_page,
+    )
+  end
 
   describe 'initialize' do
     context 'assets_dir not specified' do
@@ -31,12 +37,20 @@ RSpec.describe Percy::Capybara::Loaders::FilesystemLoader do
   describe '#snapshot_resources', type: :feature, js: true do
     it 'returns the root HTML' do
       visit '/'
-      loader = described_class.new(base_url: base_url, assets_dir: assets_dir, page: page)
+      loader = Percy::Capybara::Loaders::FilesystemLoader.new(
+        base_url: base_url,
+        assets_dir: assets_dir,
+        page: page,
+      )
       expect(loader.snapshot_resources.collect(&:resource_url)).to match_array(['/'])
     end
     it 'returns the visited html resource' do
       visit '/test-css.html'
-      loader = described_class.new(base_url: base_url, assets_dir: assets_dir, page: page)
+      loader = Percy::Capybara::Loaders::FilesystemLoader.new(
+        base_url: base_url,
+        assets_dir: assets_dir,
+        page: page,
+      )
       resource_urls = loader.snapshot_resources.collect(&:resource_url)
       expect(resource_urls).to match_array(['/test-css.html'])
     end
@@ -112,19 +126,31 @@ RSpec.describe Percy::Capybara::Loaders::FilesystemLoader do
         expect(actual_urls).to match_array(expected_urls)
       end
       it 'works with different base_url configs' do
-        loader = described_class.new(base_url: '/url-prefix/', assets_dir: assets_dir)
+        loader = Percy::Capybara::Loaders::FilesystemLoader.new(
+          base_url: '/url-prefix/',
+          assets_dir: assets_dir,
+        )
         expected_urls = loader.build_resources.collect(&:resource_url)
         expect(expected_urls).to include('/url-prefix/css/font.css')
 
-        loader = described_class.new(base_url: '/url-prefix', assets_dir: assets_dir)
+        loader = Percy::Capybara::Loaders::FilesystemLoader.new(
+          base_url: '/url-prefix',
+          assets_dir: assets_dir,
+        )
         expected_urls = loader.build_resources.collect(&:resource_url)
         expect(expected_urls).to include('/url-prefix/css/font.css')
 
-        loader = described_class.new(base_url: '/', assets_dir: assets_dir)
+        loader = Percy::Capybara::Loaders::FilesystemLoader.new(
+          base_url: '/',
+          assets_dir: assets_dir,
+        )
         expected_urls = loader.build_resources.collect(&:resource_url)
         expect(expected_urls).to include('/css/font.css')
 
-        loader = described_class.new(base_url: '', assets_dir: assets_dir)
+        loader = Percy::Capybara::Loaders::FilesystemLoader.new(
+          base_url: '',
+          assets_dir: assets_dir,
+        )
         expected_urls = loader.build_resources.collect(&:resource_url)
         expect(expected_urls).to include('/css/font.css')
       end

data/spec/lib/percy/capybara/loaders/native_loader_spec.rb

@@ -1,7 +1,9 @@
 RSpec.describe Percy::Capybara::Loaders::NativeLoader do
   let(:fake_page) { OpenStruct.new(current_url: 'http://localhost/foo') }
   let(:asset_hostnames) { nil }
-  let(:loader) { described_class.new(page: fake_page, asset_hostnames: asset_hostnames) }
+  let(:loader) do
+    Percy::Capybara::Loaders::NativeLoader.new(page: fake_page, asset_hostnames: asset_hostnames)
+  end
 
   describe '#build_resources' do
     it 'returns an empty list' do
@@ -11,12 +13,12 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
   describe '#snapshot_resources', type: :feature, js: true do
     it 'returns the root HTML' do
       visit '/'
-      loader = described_class.new(page: page)
+      loader = Percy::Capybara::Loaders::NativeLoader.new(page: page)
       expect(loader.snapshot_resources.collect(&:resource_url)).to match_array(['/'])
     end
     it 'returns the root HTML and CSS resources' do
       visit '/test-css.html'
-      loader = described_class.new(page: page)
+      loader = Percy::Capybara::Loaders::NativeLoader.new(page: page)
       resource_urls = loader.snapshot_resources.collect(&:resource_url)
       expect(resource_urls).to match_array(
         [
@@ -32,7 +34,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
     end
     it 'returns the font resources' do
       visit '/test-font.html'
-      loader = described_class.new(page: page)
+      loader = Percy::Capybara::Loaders::NativeLoader.new(page: page)
       resource_urls = loader.snapshot_resources.collect(&:resource_url)
       expect(resource_urls).to match_array(
         [
@@ -44,7 +46,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
     end
     it 'returns the root HTML and image resources' do
       visit '/test-images.html'
-      loader = described_class.new(page: page)
+      loader = Percy::Capybara::Loaders::NativeLoader.new(page: page)
       resource_urls = loader.snapshot_resources.collect(&:resource_url)
       expect(resource_urls).to match_array(
         [
@@ -65,15 +67,15 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
   describe 'nonlocal.me', type: :feature, js: true do
     let(:orig_app_host) { Capybara.app_host }
 
-    before do
+    before(:each) do
       Capybara.app_host = Capybara.app_host.gsub('http://localhost:', 'http://localtest.me:')
     end
-    after do
+    after(:each) do
       Capybara.app_host = orig_app_host
     end
     it 'returns the root HTML and image resources' do
       visit '/test-localtest-me-images.html'
-      loader = described_class.new(page: page)
+      loader = Percy::Capybara::Loaders::NativeLoader.new(page: page)
       resource_urls = loader.snapshot_resources.collect(&:resource_url)
       expect(resource_urls).to eq(
         [
@@ -159,7 +161,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
     it 'includes all linked and imported stylesheets' do
       visit '/test-css.html'
 
-      loader = described_class.new(page: page)
+      loader = Percy::Capybara::Loaders::NativeLoader.new(page: page)
       resources = loader.send(:_get_css_resources)
 
       resource = find_resource(resources, '/css/base.css')
@@ -198,7 +200,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
     it 'includes all images' do
       visit '/test-images.html'
 
-      loader = described_class.new(page: page)
+      loader = Percy::Capybara::Loaders::NativeLoader.new(page: page)
       loader.instance_variable_set(:@urls_referred_by_css, [])
       resources = loader.send(:_get_image_resources)
 
@@ -225,7 +227,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       content = File.read(path)
       # In Ruby 1.9.3 the SVG mimetype is not registered so our mini ruby webserver doesn't serve
       # the correct content type. Allow either to work here so we can test older Rubies fully.
-      expect(resource.mimetype).to match(%r{image/svg\+xml|application/octet-stream})
+      expect(resource.mimetype).to match(/image\/svg\+xml|application\/octet-stream/)
       expected_sha = Digest::SHA256.hexdigest(content)
       expect(Digest::SHA256.hexdigest(resource.content)).to eq(expected_sha)
       expect(resource.sha).to eq(expected_sha)

data/spec/lib/percy/capybara/loaders/sprockets_loader_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
     File.expand_path('../../client/rails_public_test_data', __FILE__)
   end
   let(:loader) do
-    described_class.new(
+    Percy::Capybara::Loaders::SprocketsLoader.new(
       page: page,
       sprockets_environment: environment,
       sprockets_options: sprockets_options,
@@ -29,7 +29,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
   let(:sprockets_options) do
     options = double('options')
     # Set specific files we want to compile. In normal use, this would be all asset files.
-    precompile_list = [%r{(?:/|\\|\A)(base|digested)\.(css|js)$|\.map|\.png}]
+    precompile_list = [/(?:\/|\\|\A)(base|digested)\.(css|js)$|\.map|\.png/]
     allow(options).to receive(:precompile).and_return(precompile_list)
     allow(options).to receive(:digest).and_return(digest_enabled)
     options
@@ -37,7 +37,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
 
   describe '#snapshot_resources' do
     context 'Rack::Test', type: :feature do
-      before { Capybara.app = SimpleRackApp }
+      before(:each) { Capybara.app = SimpleRackApp }
 
       it 'returns the root HTML resource' do
         visit '/'
@@ -78,7 +78,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
       expect(resources.first.content).to include('.colored-by-base')
     end
     context 'Rails app' do
-      before do
+      def setup_rails_double
         # Pretend like we're in a Rails app right now, all we care about is Rails.public_path.
         rails_double = double('Rails')
         # Pretend like the entire test_data directory is the public/ folder.
@@ -87,6 +87,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
         expect(loader).to receive(:_rails).at_least(:once).and_return(rails_double)
       end
       it 'includes files from the public folder (non-asset-pipeline)' do
+        setup_rails_double
         resources = loader.build_resources
         # Weak test that more things are in this list, because it merges asset pipeline with public.
         expect(resources.length).to be > 5
@@ -95,7 +96,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
         expect(resource_urls).to include('/assets/images/bg-relative.png') # From asset pipeline.
         expect(resource_urls).to include('/percy-from-public.svg') # Public merged into root.
         expect(resource_urls).to include('/symlink_to_images/test.png') # Symlink in public dir.
-        expect(resource_urls).not_to include('/large-file-skipped.png') # Public merged into root.
+        expect(resource_urls).to_not include('/large-file-skipped.png') # Public merged into root.
       end
       context 'digest enabled' do
         let(:digest_enabled) { true }
@@ -104,6 +105,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
           # This makes sure that we correctly merge already-compiled files in the assets directory
           # with ones from the asset pipeline. This means that Rails users who have
           # `config.assets.digest = true` set can safely run "rake assets:precompile" before tests.
+          setup_rails_double
           resources = loader.build_resources
           expected_digest_url = \
             '/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37' \

data/spec/lib/percy/capybara_spec.rb

@@ -1,10 +1,10 @@
 RSpec.describe Percy::Capybara do
-  before do
+  before(:each) do
     Percy::Capybara.reset!
     @original_env = ENV['TRAVIS_BUILD_ID']
     ENV['TRAVIS_BUILD_ID'] = nil
   end
-  after do
+  after(:each) do
     ENV['TRAVIS_BUILD_ID'] = @original_env
     ENV.delete('PERCY_ENABLE')
   end
@@ -41,11 +41,11 @@ RSpec.describe Percy::Capybara do
   end
   describe '#finalize_build' do
     it 'returns silently if no build is initialized' do
-      expect { Percy::Capybara.finalize_build }.not_to raise_error
+      expect { Percy::Capybara.finalize_build }.to_not raise_error
     end
     it 'delegates to Percy::Capybara::Client' do
       capybara_client = Percy::Capybara.capybara_client
-      expect(capybara_client).to receive(:enabled?).and_return(:true)
+      expect(capybara_client).to receive(:enabled?).and_return(true)
       build_data = {'data' => {'id' => 123}}
       expect(capybara_client.client).to receive(:create_build).and_return(build_data).once
       Percy::Capybara.initialize_build
@@ -55,9 +55,9 @@ RSpec.describe Percy::Capybara do
     it 'silently skips if disabled' do
       ENV['PERCY_ENABLE'] = '0'
       capybara_client = Percy::Capybara.capybara_client
-      expect(capybara_client.client).not_to receive(:create_build)
+      expect(capybara_client.client).to_not receive(:create_build)
       Percy::Capybara.initialize_build
-      expect(capybara_client).not_to receive(:finalize_current_build)
+      expect(capybara_client).to_not receive(:finalize_current_build)
       Percy::Capybara.finalize_build
     end
   end
@@ -65,7 +65,7 @@ RSpec.describe Percy::Capybara do
     it 'clears the current capybara_client' do
       capybara_client = Percy::Capybara.capybara_client
       Percy::Capybara.reset!
-      expect(Percy::Capybara.capybara_client).not_to eq(capybara_client)
+      expect(Percy::Capybara.capybara_client).to_not eq(capybara_client)
     end
   end
   describe '#disable!' do
@@ -82,7 +82,7 @@ RSpec.describe Percy::Capybara do
     class DummyLoader < Percy::Capybara::Loaders::NativeLoader; end
 
     it 'sets the current capybara client\'s loader' do
-      expect(Percy::Capybara.capybara_client.loader).not_to be
+      expect(Percy::Capybara.capybara_client.loader).to_not be
       Percy::Capybara.reset!
 
       Percy::Capybara.use_loader(DummyLoader)

data/spec/spec_helper.rb

@@ -38,7 +38,7 @@ RSpec.configure do |config|
     Capybara::Poltergeist::Driver.new(app, timeout: 1, url_blacklist: ['i.imgur.com'])
   end
 
-  config.before do
+  config.before(:each) do
     WebMock.disable_net_connect!(allow_localhost: true)
   end
   config.before(:each, type: :feature) do

data/spec/support/test_helpers.rb

@@ -40,7 +40,7 @@ module TestHelpers
     environment.append_path '.'
 
     sprockets_options = double('sprockets_options')
-    allow(sprockets_options).to receive(:precompile).and_return([%r{(?:/|\\|\A)base\.(css|js)$}])
+    allow(sprockets_options).to receive(:precompile).and_return([/(?:\/|\\|\A)base\.(css|js)$/])
     allow(sprockets_options).to receive(:digest).and_return(false)
 
     capybara_client.sprockets_environment = environment

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-capybara
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: percy-client
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: percy-style
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - team@percy.io
@@ -174,7 +216,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -208,6 +249,7 @@ files:
 - spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/percy-frontend-public.svg
 - spec/lib/percy/capybara/client/rails_public_test_data/large-file-skipped.png
 - spec/lib/percy/capybara/client/rails_public_test_data/percy-from-public.svg
+- spec/lib/percy/capybara/client/rails_public_test_data/symlink_to_images
 - spec/lib/percy/capybara/client/snapshots_spec.rb
 - spec/lib/percy/capybara/client/symlink_test_data/test.png
 - spec/lib/percy/capybara/client/test_data/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css
@@ -269,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Percy::Capybara
@@ -283,6 +325,7 @@ test_files:
 - spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/percy-frontend-public.svg
 - spec/lib/percy/capybara/client/rails_public_test_data/large-file-skipped.png
 - spec/lib/percy/capybara/client/rails_public_test_data/percy-from-public.svg
+- spec/lib/percy/capybara/client/rails_public_test_data/symlink_to_images
 - spec/lib/percy/capybara/client/snapshots_spec.rb
 - spec/lib/percy/capybara/client/symlink_test_data/test.png
 - spec/lib/percy/capybara/client/test_data/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css

data/.rubocop_todo.yml

@@ -1,86 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2017-02-08 20:09:02 -0800 using RuboCop version 0.47.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 8
-Metrics/AbcSize:
-  Max: 54
-
-# Offense count: 27
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 300
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 200
-
-# Offense count: 5
-Metrics/CyclomaticComplexity:
-  Max: 11
-
-# Offense count: 11
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 57
-
-# Offense count: 2
-Metrics/PerceivedComplexity:
-  Max: 12
-
-# Offense count: 43
-# Configuration parameters: SkipBlocks.
-RSpec/DescribedClass:
-  Exclude:
-    - 'spec/lib/percy/capybara/client_spec.rb'
-    - 'spec/lib/percy/capybara/http_fetcher_spec.rb'
-    - 'spec/lib/percy/capybara_spec.rb'
-
-# Offense count: 29
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/lib/percy/capybara/client/builds_spec.rb'
-    - 'spec/lib/percy/capybara/client/snapshots_spec.rb'
-    - 'spec/lib/percy/capybara/client_spec.rb'
-    - 'spec/lib/percy/capybara/loaders/base_loader_spec.rb'
-    - 'spec/lib/percy/capybara/loaders/filesystem_loader_spec.rb'
-    - 'spec/lib/percy/capybara/loaders/native_loader_spec.rb'
-    - 'spec/lib/percy/capybara/loaders/sprockets_loader_spec.rb'
-    - 'spec/lib/percy/capybara_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: AssignmentOnly.
-RSpec/InstanceVariable:
-  Exclude:
-    - 'spec/lib/percy/capybara_spec.rb'
-
-# Offense count: 42
-RSpec/MultipleExpectations:
-  Max: 29
-
-# Offense count: 1
-# Configuration parameters: Max.
-RSpec/NestedGroups:
-  Enabled: false
-
-# Offense count: 10
-# Configuration parameters: IgnoreSymbolicNames.
-RSpec/VerifiedDoubles:
-  Exclude:
-    - 'spec/lib/percy/capybara/client/builds_spec.rb'
-    - 'spec/lib/percy/capybara/client_spec.rb'
-    - 'spec/lib/percy/capybara/loaders/base_loader_spec.rb'
-    - 'spec/lib/percy/capybara/loaders/sprockets_loader_spec.rb'
-    - 'spec/lib/percy/capybara_spec.rb'
-    - 'spec/support/test_helpers.rb'
-
-# Offense count: 1
-Style/StructInheritance:
-  Exclude:
-    - 'lib/percy/capybara/httpfetcher.rb'