percy-capybara 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ec1811094152205c30db1c67c183b14e85d3a52
-  data.tar.gz: 039f35ab33a64b6b14d0d3328da291a824b9e0c1
+  metadata.gz: 6498403c9a10399a29d67eafa17d576300d62fa1
+  data.tar.gz: 5159d6ff409edac2d447b71990050b46b235f6e8
 SHA512:
-  metadata.gz: acd5e2f499016bbcf3e9fcd1321d2a601258117ba275553dc600502dfb32a13dffe8c9ad6189748738562d37372df781586f5472aec6c071a1e0dca1139fba7b
-  data.tar.gz: d3ec4106d244bdffb26f7a79506e42b291df27a92e4f53f939835f117cba4e3e95105c9f4f0a6e4f1dd3da249608b882865d79ed5bc4d70cdaa8a9a963077df4
+  metadata.gz: 24ca4f78314dbfd15f3575b1199a56713c79b11909b863e9e932cfe1c11e3ef3bf6111e50b6f49100f35949b4498eab23055a2bc930ffab8e2db08bab4064123
+  data.tar.gz: 57f2014995d9afc020debf852b4f0829c9b20564c8a831f22c257f43e7ab550d7b6fee9955000fb36cb91645585c7919197ee9a839cc4d42b1bcfacde07ce88e

data/.gitignore

@@ -1,5 +1,4 @@
 /.bundle/
-/Gemfile.lock
 /.yardoc
 /_yardoc/
 /coverage/

data/Gemfile.lock

@@ -0,0 +1,130 @@
+PATH
+  remote: .
+  specs:
+    percy-capybara (2.1.1)
+      percy-client (~> 1.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    capybara (2.6.2)
+      addressable
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    capybara-webkit (1.8.0)
+      capybara (>= 2.3.0, < 2.7.0)
+      json
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.0)
+    concurrent-ruby (1.0.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.10)
+    formatador (0.2.5)
+    guard (2.13.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, <= 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.6.4)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    hashdiff (0.2.3)
+    httpclient (2.8.0)
+    json (1.8.3)
+    listen (3.0.6)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9.7)
+    lumberjack (1.0.10)
+    method_source (0.8.2)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    multi_json (1.11.2)
+    multipart-post (2.0.0)
+    nenv (0.3.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    notiffany (0.0.8)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    percy-client (1.4.1)
+      faraday (>= 0.9)
+      httpclient (>= 2.6)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rake (10.5.0)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.2)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubyzip (1.1.7)
+    safe_yaml (1.0.4)
+    selenium-webdriver (2.51.0)
+      childprocess (~> 0.5)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
+    shellany (0.0.1)
+    slop (3.6.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    thor (0.19.1)
+    webmock (1.22.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    websocket (1.2.2)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.7)
+  capybara (~> 2.4)
+  capybara-webkit (>= 1.6)
+  faraday (>= 0.8)
+  guard-rspec
+  mime-types (< 3)
+  percy-capybara!
+  rake (~> 10.0)
+  rspec (~> 3.2)
+  selenium-webdriver
+  sprockets (>= 3.2.0)
+  webmock (~> 1)
+
+BUNDLED WITH
+   1.10.6

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

@@ -1,6 +1,7 @@
 require 'percy/capybara/loaders/base_loader'
 require 'digest'
 require 'find'
+require 'set'
 require 'uri'
 
 module Percy
@@ -13,7 +14,6 @@ module Percy
         attr_reader :sprockets_options
 
         SKIP_RESOURCE_EXTENSIONS = [
-          '.js',  # Ignore JavaScript.
           '.map',  # Ignore source maps.
         ]
 
@@ -31,6 +31,7 @@ module Percy
 
         def build_resources
           resources = []
+          loaded_resource_urls = Set.new
 
           # Load resources from the asset pipeline.
           _asset_logical_paths.each do |logical_path|
@@ -51,6 +52,8 @@ module Percy
             end
 
             next if SKIP_RESOURCE_EXTENSIONS.include?(File.extname(resource_url))
+
+            loaded_resource_urls.add(resource_url)
             resources << Percy::Client::Resource.new(resource_url, sha: sha, content: content)
           end
 
@@ -68,11 +71,12 @@ module Percy
               # of the app.
               resource_url = path.sub(public_path, '')
 
-              sha = Digest::SHA256.hexdigest(File.read(path))
+              # Skip precompiled files already included via the asset pipeline.
+              next if loaded_resource_urls.include?(resource_url)
 
+              sha = Digest::SHA256.hexdigest(File.read(path))
               resources << Percy::Client::Resource.new(resource_url, sha: sha, path: path)
             end
-
           end
 
           resources

data/lib/percy/capybara/version.rb

@@ -1,5 +1,5 @@
 module Percy
   module Capybara
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end
 end

data/spec/lib/percy/capybara/client/testdata/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css

@@ -0,0 +1 @@
+--

data/spec/lib/percy/capybara/client/testdata/css/digested.css

@@ -0,0 +1 @@
+-- Do not change this, these contents generate a specific digested filename for testing. --

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

@@ -20,10 +20,13 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
     environment.append_path '.'
     environment
   end
+  let(:digest_enabled) { false }
   let(:sprockets_options) do
     options = double('options')
-    allow(options).to receive(:precompile).and_return([/(?:\/|\\|\A)base\.(css|js)$|\.map/])
-    allow(options).to receive(:digest).and_return(false)
+    # Set specific files we want to compile. In normal use, this would be all CSS and JS files.
+    precompile_list = [/(?:\/|\\|\A)(base|digested)\.(css|js)$|\.map/]
+    allow(options).to receive(:precompile).and_return(precompile_list)
+    allow(options).to receive(:digest).and_return(digest_enabled)
     options
   end
 
@@ -52,22 +55,41 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
   describe '#build_resources', type: :feature do
     it 'returns "build resources" from filtered sprockets paths' do
       resources = loader.build_resources
-      expect(resources.map { |r| r.resource_url }).to eq(["/assets/css/base.css"])
+      expected_resources = [
+        '/assets/css/base.css',
+        '/assets/css/digested.css',
+        '/assets/js/base.js',
+      ]
+      expect(resources.map { |r| r.resource_url }).to eq(expected_resources)
       expect(resources.first.content).to include('.colored-by-base')
     end
     context 'Rails app' do
-      it 'includes files from the public folder (non-asset-pipeline)' do
-
+      before(:each) do
         # 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 testdata directory is the public/ folder.
         expect(rails_double).to receive(:public_path).and_return(environment.root)
         expect(loader).to receive(:_rails).at_least(:once).and_return(rails_double)
-
+      end
+      it 'includes files from the public folder (non-asset-pipeline)' do
         resources = loader.build_resources
         expect(resources.length).to be > 5  # Weak test that more things are in this list.
         expect(resources.map { |r| r.resource_url }).to include('/images/percy.svg')
       end
+      context 'digest enabled' do
+        let(:digest_enabled) { true }
+
+        it 'only includes pre-compiled, digested files once' 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.
+          resources = loader.build_resources
+          expected_digest_url = \
+            '/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css'
+          digested_resources = resources.select { |r| r.resource_url == expected_digest_url }
+          expect(digested_resources.length).to eq(1)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-capybara
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: percy-client
@@ -176,6 +176,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -193,7 +194,9 @@ files:
 - percy-capybara.gemspec
 - spec/lib/percy/capybara/client/builds_spec.rb
 - spec/lib/percy/capybara/client/snapshots_spec.rb
+- spec/lib/percy/capybara/client/testdata/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css
 - spec/lib/percy/capybara/client/testdata/css/base.css
+- spec/lib/percy/capybara/client/testdata/css/digested.css
 - spec/lib/percy/capybara/client/testdata/css/imports.css
 - spec/lib/percy/capybara/client/testdata/css/level0-imports.css
 - spec/lib/percy/capybara/client/testdata/css/level1-imports.css
@@ -241,14 +244,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Percy::Capybara
 test_files:
 - spec/lib/percy/capybara/client/builds_spec.rb
 - spec/lib/percy/capybara/client/snapshots_spec.rb
+- spec/lib/percy/capybara/client/testdata/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css
 - spec/lib/percy/capybara/client/testdata/css/base.css
+- spec/lib/percy/capybara/client/testdata/css/digested.css
 - spec/lib/percy/capybara/client/testdata/css/imports.css
 - spec/lib/percy/capybara/client/testdata/css/level0-imports.css
 - spec/lib/percy/capybara/client/testdata/css/level1-imports.css
@@ -276,4 +281,3 @@ test_files:
 - spec/lib/percy/capybara_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_helpers.rb
-has_rdoc: