percy-capybara 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5d969e6040123759001a610740fe46115eb5c8
-  data.tar.gz: 64345632abd3e80a2216bcd5f8b912be6c30718a
+  metadata.gz: bf2e261e73d78a50c736b1821ec334ac00574a4f
+  data.tar.gz: eb8e02a61b51589136030b10a4c3bb888a905073
 SHA512:
-  metadata.gz: 4d876fa8b49fb2f66979cdaac78e7051ba294087f3747cf97cffc94240d48b8e503866d1ee9173cda6d4534cf3c4f6f12c4a1a42ebcfe4f180ae14708926ae73
-  data.tar.gz: 60be216d386341d9428a535406ba309116c086a5e1cc18e18b08218133fdcdd8f96f003f39dd4c857e5ffe1e1a1affb7066b9394934932a4b2d49f32f617c915
+  metadata.gz: 13a5da1bcb56e9b2933a5c64de5d1c16cf9719a420957a138127df81a648501144144c02508479c6a23c9f1c81308edd793b1113590467a521fc084693c7447f
+  data.tar.gz: d4341e7c86de918ea31a908753c21f5e6f34981ed78c5ea6beae8cd6df673a4babed5f5ea941015635ae4f4d461fd06950586b98d1642e968a7c3c75bccc5cc1

data/.travis.yml

@@ -2,8 +2,9 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 1.9.3
-  - 2.2
+  - ruby-2.2.6
+  - ruby-2.3.3
+  - ruby-2.4.0
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -0,0 +1 @@
+See [releases](https://github.com/percy/percy-capybara/releases).

data/lib/percy/capybara/client.rb

@@ -20,6 +20,8 @@ module Percy
       attr_accessor :custom_loader
 
       def initialize(options = {})
+        @failed = false
+
         @client = options[:client] || Percy.client
         @enabled = options[:enabled]
 
@@ -29,14 +31,22 @@ module Percy
         end
       end
 
+      # Check that environment variables required for Percy::Client are set
+      def required_environment_variables_set?
+        !(ENV['PERCY_PROJECT'].nil? || ENV['PERCY_TOKEN'].nil?)
+      end
+
       def enabled?
         return @enabled if !@enabled.nil?
 
-        # Enable if PERCY_ENABLE=1 in local dev (allow disabling if 0).
-        return @enabled ||= ENV['PERCY_ENABLE'] == '1' if ENV['PERCY_ENABLE']
+        # Disable if PERCY_ENABLE is set to 0
+        return @enabled = false if ENV['PERCY_ENABLE'] == '0'
+
+        # Enable if required environment variables are set
+        return @enabled = true if required_environment_variables_set?
 
-        # If in supported CI environment.
-        @enabled ||= !Percy::Client::Environment.current_ci.nil?
+        # Disable otherwise
+        return @enabled = false
       end
 
       def disable!

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

@@ -32,6 +32,7 @@ module Percy
         end
 
         def build_initialized?
+          return false unless defined? @current_build
           !!@current_build
         end
 

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

@@ -77,7 +77,6 @@ module Percy
             response = _fetch_resource_url(url)
             _absolute_url_to_relative!(url, _current_host_port)
             next if !response
-            sha = Digest::SHA256.hexdigest(response.body)
             resources << Percy::Client::Resource.new(
               url, mimetype: 'text/css', content: response.body)
           end
@@ -164,7 +163,6 @@ module Percy
             _absolute_url_to_relative!(resource_url, _current_host_port)
             next if !response
 
-            sha = Digest::SHA256.hexdigest(response.body)
             resources << Percy::Client::Resource.new(
               resource_url, mimetype: response.content_type, content: response.body)
           end
@@ -210,10 +208,10 @@ module Percy
           !!result
         end
 
-        # @priivate
+        # @private
         def _current_host_port
           url_match = URL_REGEX.match(page.current_url)
-          host_port = url_match[1] + url_match[2] + (url_match[3] || '')
+          url_match[1] + url_match[2] + (url_match[3] || '')
         end
 
         # @private

data/lib/percy/capybara/version.rb

@@ -1,5 +1,5 @@
 module Percy
   module Capybara
-    VERSION = '2.3.3'
+    VERSION = '2.3.4'
   end
 end

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

@@ -89,7 +89,6 @@ RSpec.describe Percy::Capybara::Client::Builds do
       expect(capybara_client.client).to receive(:upload_resource)
         .and_raise(Percy::Client::ConnectionFailed)
 
-      result = capybara_client.initialize_build
       expect(capybara_client.initialize_build).to eq(nil)
       expect(capybara_client.failed?).to eq(true)
       expect(build_stub).to have_been_requested

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

@@ -5,27 +5,34 @@ RSpec.describe Percy::Capybara::Client do
     expect(capybara_client.client).to eq(client)
   end
   describe '#enabled?' do
-    before(:each) do
-      @original_env = ENV['TRAVIS_BUILD_ID']
-      ENV['TRAVIS_BUILD_ID'] = nil
-    end
-    after(:each) do
-      ENV['TRAVIS_BUILD_ID'] = @original_env
-      ENV['PERCY_ENABLE'] = nil
-    end
-
-    context 'in supported CI environment' do
-      it 'is true' do
-        ENV['TRAVIS_BUILD_ID'] = '123'
+    context 'when required environment variables set' do
+      before(:context) { set_required_env_variables }
+      after(:context) { clear_required_env_variables }
+      
+      it 'is true when PERCY_ENABLE is 1' do
+        ENV['PERCY_ENABLE'] = '1'
         expect(Percy::Capybara::Client.new.enabled?).to eq(true)
       end
+      it 'is true when PERCY_ENABLE is not set' do
+        ENV.delete 'PERCY_ENABLE'
+        expect(Percy::Capybara::Client.new.enabled?).to eq(true)
+      end
+      it 'is false when PERCY_ENABLE is 0' do
+        ENV['PERCY_ENABLE'] = '0'
+        expect(Percy::Capybara::Client.new.enabled?).to eq(false)
+      end
     end
-    it 'is false by default for local dev environments or unknown CI environments' do
-      expect(Percy::Capybara::Client.new.enabled?).to eq(false)
-    end
-    it 'is true if PERCY_ENABLE=1 is set' do
-      ENV['PERCY_ENABLE'] = '1'
-      expect(Percy::Capybara::Client.new.enabled?).to eq(true)
+
+    context 'when required environment variables not set' do
+      before(:each) { clear_required_env_variables }
+      it 'is false' do
+        ENV.delete 'PERCY_ENABLE'
+        expect(Percy::Capybara::Client.new.enabled?).to eq(false)
+      end
+      it 'is false when PERCY_ENABLE is 1' do
+        ENV['PERCY_ENABLE'] = '1'
+        expect(Percy::Capybara::Client.new.enabled?).to eq(false)
+      end
     end
   end
   describe '#failed?' do
@@ -107,4 +114,3 @@ RSpec.describe Percy::Capybara::Client do
     end
   end
 end
-

data/spec/lib/percy/capybara_spec.rb

@@ -2,12 +2,11 @@ RSpec.describe Percy::Capybara do
   before(:each) do
     Percy::Capybara.reset!
     @original_env = ENV['TRAVIS_BUILD_ID']
-    ENV['PERCY_ENABLE'] = '1'
     ENV['TRAVIS_BUILD_ID'] = nil
   end
   after(:each) do
     ENV['TRAVIS_BUILD_ID'] = @original_env
-    ENV['PERCY_ENABLE'] = nil
+    ENV.delete('PERCY_ENABLE')
   end
 
   describe '#capybara_client' do
@@ -27,8 +26,8 @@ RSpec.describe Percy::Capybara do
       expect(capybara_client).to receive(:snapshot).with(mock_page, name: '/foo.html (modal)').once
       Percy::Capybara.snapshot(mock_page, name: '/foo.html (modal)')
     end
-    it 'silently skips if not enabled' do
-      ENV['PERCY_ENABLE'] = nil
+    it 'silently skips if disabled' do
+      ENV['PERCY_ENABLE'] = '0'
       mock_page = double('page')
       Percy::Capybara.snapshot(mock_page)
     end
@@ -46,14 +45,15 @@ RSpec.describe Percy::Capybara do
     end
     it 'delegates to Percy::Capybara::Client' do
       capybara_client = Percy::Capybara.capybara_client
+      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
       expect(capybara_client).to receive(:finalize_current_build).once
       Percy::Capybara.finalize_build
     end
-    it 'silently skips if not enabled' do
-      ENV['PERCY_ENABLE'] = nil
+    it 'silently skips if disabled' do
+      ENV['PERCY_ENABLE'] = '0'
       capybara_client = Percy::Capybara.capybara_client
       expect(capybara_client.client).to_not receive(:create_build)
       Percy::Capybara.initialize_build
@@ -70,7 +70,9 @@ RSpec.describe Percy::Capybara do
   end
   describe '#disable!' do
     it 'sets the current capybara_client to disabled' do
-      capybara_client = Percy::Capybara.capybara_client
+      capybara_client = Percy::Capybara::Client.new(enabled:true)
+      expect(Percy::Capybara).to receive(:capybara_client)
+        .and_return(capybara_client).exactly(3).times
       expect(Percy::Capybara.capybara_client.enabled?).to eq(true)
       Percy::Capybara.disable!
       expect(Percy::Capybara.capybara_client.enabled?).to eq(false)
@@ -80,7 +82,6 @@ RSpec.describe Percy::Capybara 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

data/spec/support/test_helpers.rb

@@ -46,4 +46,16 @@ module TestHelpers
     capybara_client.sprockets_environment = environment
     capybara_client.sprockets_options = sprockets_options
   end
-end
+
+  # Set the environment variables required by Percy::Client
+  def set_required_env_variables
+    ENV['PERCY_TOKEN'] = 'aa'
+    ENV['PERCY_PROJECT'] = 'aa'
+  end
+
+  # Clear the environment variables required by Percy::Client
+  def clear_required_env_variables
+    ENV.delete('PERCY_TOKEN')
+    ENV.delete('PERCY_PROJECT')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-capybara
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: percy-client
@@ -175,8 +175,8 @@ files:
 - ".rspec"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md