percy-capybara 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6498403c9a10399a29d67eafa17d576300d62fa1
-  data.tar.gz: 5159d6ff409edac2d447b71990050b46b235f6e8
+  metadata.gz: af65d5970c1d8e9a7ad3fc82db10235d1ab5b6c3
+  data.tar.gz: 53046e99547f380834dc2a965b0943aa07e73f56
 SHA512:
-  metadata.gz: 24ca4f78314dbfd15f3575b1199a56713c79b11909b863e9e932cfe1c11e3ef3bf6111e50b6f49100f35949b4498eab23055a2bc930ffab8e2db08bab4064123
-  data.tar.gz: 57f2014995d9afc020debf852b4f0829c9b20564c8a831f22c257f43e7ab550d7b6fee9955000fb36cb91645585c7919197ee9a839cc4d42b1bcfacde07ce88e
+  metadata.gz: 2bd0fc3b80bf5f6180eec99858c31a54fd8804639d5fc4e78fdfbc5dcbf9d5f41a74ded0ffa7e49ba0115ec81be1e04c46a3553fdc30e4ac7a40fa49bfa78e3c
+  data.tar.gz: 9c3fa55f7c6084535cb17cec37cc4aa387ffb946ad47f2f6ff6945757a21d59399e2e2ceb8004cfc53d27f3a279649105ced69d22ec90dbddf6a5eea818c2083

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    percy-capybara (2.1.1)
+    percy-capybara (2.2.0)
       percy-client (~> 1.4)
 
 GEM

data/lib/percy/capybara.rb

@@ -52,5 +52,9 @@ module Percy
     def self.disable!
       capybara_client.disable!
     end
+
+    def self.use_loader(loader)
+      capybara_client.custom_loader = loader
+    end
   end
 end

data/lib/percy/capybara/client.rb

@@ -17,6 +17,7 @@ module Percy
 
       attr_accessor :sprockets_environment
       attr_accessor :sprockets_options
+      attr_accessor :custom_loader
 
       def initialize(options = {})
         @client = options[:client] || Percy.client
@@ -43,7 +44,7 @@ module Percy
       end
 
       def rescue_connection_failures(&block)
-        raise ArgumentError.new('block is requried') if !block_given?
+        raise ArgumentError.new('block is required') if !block_given?
         begin
           block.call
         rescue Percy::Client::ServerError,  # Rescue server errors.
@@ -62,7 +63,10 @@ module Percy
       end
 
       def initialize_loader(options = {})
-        if sprockets_environment && sprockets_options
+        if custom_loader
+          Percy.logger.debug { 'Using a custom loader to discover assets.' }
+          custom_loader.new(options)
+        elsif sprockets_environment && sprockets_options
           Percy.logger.debug { 'Using sprockets_loader to discover assets.' }
           options[:sprockets_environment] = sprockets_environment
           options[:sprockets_options] = sprockets_options

data/lib/percy/capybara/version.rb

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

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

@@ -82,14 +82,28 @@ RSpec.describe Percy::Capybara::Client do
   describe '#initialize_loader' do
     let(:capybara_client) { Percy::Capybara::Client.new }
 
-    it 'returns a NativeLoader if no sprockets config' do
-      expect(capybara_client.initialize_loader.class).to eq(Percy::Capybara::Loaders::NativeLoader)
+    context 'when a custom loader has been set' do
+      it 'returns an instance of the clients custom loader' do
+        class DummyLoader < Percy::Capybara::Loaders::NativeLoader; end
+        capybara_client.custom_loader = DummyLoader
+        loader = capybara_client.initialize_loader
+        expect(loader.class).to eq(DummyLoader)
+      end
+    end
+
+    context 'when sprockets is configured' do
+      it 'returns a SprocketsLoader' do
+        capybara_client.sprockets_environment = double('sprockets_environment')
+        capybara_client.sprockets_options = double('sprockets_options')
+        loader = capybara_client.initialize_loader
+        expect(loader.class).to eq(Percy::Capybara::Loaders::SprocketsLoader)
+      end
     end
-    it 'returns a SprocketsLoader if sprockets is configured' do
-      capybara_client.sprockets_environment = double('sprockets_environment')
-      capybara_client.sprockets_options = double('sprockets_options')
-      loader = capybara_client.initialize_loader
-      expect(loader.class).to eq(Percy::Capybara::Loaders::SprocketsLoader)
+
+    context 'when no configuration has been set' do
+      it 'returns a NativeLoader' do
+        expect(capybara_client.initialize_loader.class).to eq(Percy::Capybara::Loaders::NativeLoader)
+      end
     end
   end
 end

data/spec/lib/percy/capybara_spec.rb

@@ -76,4 +76,14 @@ RSpec.describe Percy::Capybara do
       expect(Percy::Capybara.capybara_client.enabled?).to eq(false)
     end
   end
+  describe '#use_loader' do
+    class DummyLoader < Percy::Capybara::Loaders::NativeLoader; end
+
+    it 'sets the current capybara clients custom loader' do
+      capybara_client = Percy::Capybara::Client
+      expect(Percy::Capybara.capybara_client.custom_loader).to_not be
+      Percy::Capybara.use_loader(DummyLoader)
+      expect(Percy::Capybara.capybara_client.custom_loader).to be
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-capybara
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: percy-client