percy-capybara 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 700625bc07e0be50c30a6e9838280e5b642395dc
-  data.tar.gz: f56557aaa8909e676cfbd638655ea506bcd99867
+  metadata.gz: 5c84f5ed6c72de98416d621dfd3ab46867ea78d2
+  data.tar.gz: 7977a4ed7022626bbdb14ca3323b6def95c5e9d8
 SHA512:
-  metadata.gz: ee826f8bab3a6f19233b7a85acade3509e62cf65fccfb82c21332eca520908b0579a3c03e099202cfeea0a700e7d21e001a2b0cdc70aef8efce8c10292dcf331
-  data.tar.gz: 340ddc44575e7bc6ceaed558494b94cef8e8cf2a4c7bf3e5e0499fe6d77047821d4cc25b91b8c7a0c433ebf0a729e19f57baef951fd2ad28d13fdd433209646b
+  metadata.gz: 3958fb07643023624bd6e38a6541b806e80355c749245b5c8c4d0b76944b9c8e66985428ad80e386224da8886f68c9cd2a18fa107a7faf354e4771422a92cd4f
+  data.tar.gz: 6ac2f13f3775fc18fe1289ce982fb1758e774b4cc5522161e40f4faf82f493704c4e2fe4b2435c51f7aac7051f93ddf7cb633252a98b33ebea5271e3a9be8b48

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
   - 1.9.3
   - 2.1.1
   - 2.2.2
   - ruby-head
-script: xvfb-run rspec
+before_install:
+  - gem update bundler
+script: xvfb-run bundle exec rspec

data/lib/percy/capybara/client.rb

@@ -42,8 +42,9 @@ module Percy
         raise ArgumentError.new('block is requried') if !block_given?
         begin
           block.call
-        rescue Percy::Client::HttpError,
-            Percy::Client::ConnectionFailed,
+        rescue Percy::Client::ServerError,  # Rescue server errors.
+            Percy::Client::PaymentRequiredError,  # Rescue quota exceeded errors.
+            Percy::Client::ConnectionFailed,  # Rescue some networking errors.
             Percy::Client::TimeoutError => e
           Percy.logger.error(e)
           @enabled = false

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

@@ -1,10 +1,4 @@
-require 'set'
-require 'faraday'
-require 'httpclient'
-require 'digest'
-require 'uri'
 require 'time'
-require 'pathname'
 
 module Percy
   module Capybara
@@ -21,31 +15,10 @@ module Percy
           return if !enabled?  # Silently skip if the client is disabled.
 
           name = options[:name]
+          widths = options[:widths]
           loader = initialize_loader(page: page)
 
           Percy.logger.debug { "Snapshot started (name: #{name.inspect})" }
-
-          # If this is the first snapshot, create the build and upload build resources.
-          # DEPRECATED: this flow is for the pre-parallel world.
-          if !build_initialized?
-            Percy.logger.warn do
-              "DEPRECATED: percy-capybara will remove implicitly created builds. You should " +
-              "update your usage to call initialize_build explicitly at the start of a test " +
-              "suite, or to use the Percy RSpec setup to do it for you."
-            end
-
-            start = Time.now
-            build_resources = loader.build_resources
-            if Percy.config.debug
-              build_resources.each do |build_resource|
-                Percy.logger.debug { "Build resource: #{build_resource.resource_url}" }
-              end
-            end
-            Percy.logger.debug { "All build resources loaded (#{Time.now - start}s)" }
-            initialize_build(resources: build_resources)
-            _upload_missing_build_resources(build_resources)
-          end
-
           start = Time.now
           current_build_id = current_build['data']['id']
           resources = loader.snapshot_resources
@@ -59,7 +32,12 @@ module Percy
           # Create the snapshot and upload any missing snapshot resources.
           start = Time.now
           rescue_connection_failures do
-            snapshot = client.create_snapshot(current_build_id, resources, name: name)
+            snapshot = client.create_snapshot(
+              current_build_id,
+              resources,
+              name: name,
+              widths: widths,
+            )
             snapshot['data']['relationships']['missing-resources']['data'].each do |missing_resource|
               sha = missing_resource['id']
               client.upload_resource(current_build_id, resource_map[sha].content)

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

@@ -79,7 +79,7 @@ module Percy
         end
 
         def _rails
-          return Rails if defined?(Rails)
+          Rails if defined?(Rails)
         end
 
         def _asset_logical_paths

data/lib/percy/capybara/version.rb

@@ -1,5 +1,5 @@
 module Percy
   module Capybara
-    VERSION = '1.2.0'
+    VERSION = '2.0.0'
   end
 end

data/percy-capybara.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'percy-client', '>= 1.3.0'
+  spec.add_dependency 'percy-client', '~> 1.4'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'capybara-webkit', '>= 1.6'
   spec.add_development_dependency 'selenium-webdriver'
   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 'sprockets', '>= 3.2.0'
 end

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

@@ -9,35 +9,23 @@ RSpec.describe Percy::Capybara::Client::Snapshots, type: :feature do
   describe '#snapshot', type: :feature, js: true do
     context 'simple page with no resources' do
       before(:each) { setup_sprockets(capybara_client) }
-
-      it 'creates a snapshot and uploads missing build resources and missing snapshot resources' do
-        visit '/'
-        loader = capybara_client.initialize_loader(page: page)
-
-        build_resource_sha = loader.build_resources.first.sha
-        snapshot_resource_sha = loader.snapshot_resources.first.sha
-
-        mock_response = {
+      let(:loader) { capybara_client.initialize_loader(page: page) }
+      let(:build_resource_sha) { loader.build_resources.first.sha }
+      let(:snapshot_resource_sha) { loader.snapshot_resources.first.sha }
+      let(:mock_build_response) do
+        {
           'data' => {
             'id' => '123',
             'type' => 'builds',
             'relationships' => {
               'self' => "/api/v1/snapshots/123",
-              'missing-resources' => {
-                'data' => [
-                  {
-                    'type' => 'resources',
-                    'id' => build_resource_sha,
-                  },
-                ],
-              },
+              'missing-resources' => {},
             },
           },
         }
-        stub_request(:post, 'https://percy.io/api/v1/repos/percy/percy-capybara/builds/')
-          .to_return(status: 201, body: mock_response.to_json)
-
-        mock_response = {
+      end
+      let(:mock_snapshot_response) do
+        {
           'data' => {
             'id' => '256',
             'type' => 'snapshots',
@@ -54,31 +42,37 @@ RSpec.describe Percy::Capybara::Client::Snapshots, type: :feature do
             },
           },
         }
+      end
+      before :each do
+        visit '/'
+        loader  # Force evaluation now.
+        stub_request(:post, 'https://percy.io/api/v1/repos/percy/percy-capybara/builds/')
+          .to_return(status: 201, body: mock_build_response.to_json)
         stub_request(:post, 'https://percy.io/api/v1/builds/123/snapshots/')
-          .to_return(status: 201, body: mock_response.to_json)
-        build_resource_stub = stub_request(:post, "https://percy.io/api/v1/builds/123/resources/")
-          .with(body: /#{build_resource_sha}/)
-          .to_return(status: 201, body: {success: true}.to_json)
-        stub_request(:post, "https://percy.io/api/v1/builds/123/resources/")
-          .with(body: /#{snapshot_resource_sha}/)
-          .to_return(status: 201, body: {success: true}.to_json)
+          .to_return(status: 201, body: mock_snapshot_response.to_json)
+          stub_request(:post, "https://percy.io/api/v1/builds/123/resources/")
+            .with(body: /#{snapshot_resource_sha}/)
+            .to_return(status: 201, body: {success: true}.to_json)
         stub_request(:post, "https://percy.io/api/v1/snapshots/256/finalize")
-          .to_return(status: 200, body: '{"success":true}')
+          .to_return(status: 200, body: {success: true}.to_json)
+        capybara_client.initialize_build
+      end
 
-        expect(capybara_client.build_initialized?).to eq(false)
+      it 'creates a snapshot' do
+        expect(capybara_client.client).to receive(:create_snapshot)
+          .with(anything, anything, {name: nil, widths: nil})
+          .and_call_original
         expect(capybara_client.snapshot(page)).to eq(true)
-        expect(capybara_client.build_initialized?).to eq(true)
+      end
+      it 'passes through name and width options to the percy client if given' do
+        expect(capybara_client.client).to receive(:create_snapshot)
+          .with(anything, anything, {name: 'foo', widths: [320, 1024]})
+          .and_call_original
 
-        # Second time, no build resources are uploaded.
-        remove_request_stub(build_resource_stub)
-        expect(capybara_client.snapshot(page)).to eq(true)
+        expect(capybara_client.snapshot(page, name: 'foo', widths: [320, 1024])).to eq(true)
+        expect(capybara_client.failed?).to eq(false)
       end
       it 'safely handles connection errors' do
-        visit '/'
-        build_data = {'data' => {'id' => 123}}
-        expect(capybara_client.client).to receive(:create_build).and_return(build_data)
-        capybara_client.initialize_build
-
         expect(capybara_client.client).to receive(:create_snapshot)
           .and_raise(Percy::Client::ConnectionFailed)
         expect(capybara_client.snapshot(page)).to eq(nil)

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

@@ -43,9 +43,17 @@ RSpec.describe Percy::Capybara::Client do
       expect(capybara_client.enabled?).to eq(true)
       expect(capybara_client.failed?).to eq(false)
     end
-    it 'makes block safe from HttpError' do
+    it 'makes block safe from server errors' do
       result = capybara_client.rescue_connection_failures do
-        raise Percy::Client::HttpError.new(500, 'POST', '', '')
+        raise Percy::Client::ServerError.new(500, 'POST', '', '')
+      end
+      expect(result).to eq(nil)
+      expect(capybara_client.enabled?).to eq(false)
+      expect(capybara_client.failed?).to eq(true)
+    end
+    it 'makes block safe from quota exceeded errors' do
+      result = capybara_client.rescue_connection_failures do
+        raise Percy::Client::PaymentRequiredError.new(409, 'POST', '', '')
       end
       expect(result).to eq(nil)
       expect(capybara_client.enabled?).to eq(false)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: percy-capybara
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: percy-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +241,7 @@ 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
@@ -262,4 +276,3 @@ test_files:
 - spec/lib/percy/capybara_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_helpers.rb
-has_rdoc: