percy-client 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8556dfa5a032fd21caa62af7e38c2b93ce945a40
-  data.tar.gz: 0d176888922bc1309e4bdd217b34e6c6835356a0
+  metadata.gz: b94954861b98e83a57b9320d28682b66a66e49ee
+  data.tar.gz: b6b9a044bab771d3f3fa37ab4922a865c3cc465a
 SHA512:
-  metadata.gz: 22b2d8ef3a9d9c79f106687ef66c4fb893354512598448c3c36cc193205f8d1746d1902b998a8a8ea90d73f6cfdc1b2edb09ac6a4ce9bab7e11ec288eacaefa1
-  data.tar.gz: 0ce75d192a413664ff2c032c326f688b17748b8cd30cac51746620b5081aedf5271d89ad73da6c02ef66f611602b7faab090e80e51d2426edf1032e8d7816b03
+  metadata.gz: 9c70290afed751c1612eb3dec8024511c4bc5cb127f3919f84eb1ccec87e30ad2df515153d7c1d0ed4be78423f026ca021847d43bc8a21b20b62f9fa9278573a
+  data.tar.gz: 0637dcf07a4c97a5f8904bb4653ce9d6bfac3aa8f576c39a550a35a1cc0fd5716a84d074f62bef4980d67aa13b4b4fe9492dd9ee7fbf7349edd4228ede60c8da

data/Gemfile

@@ -5,6 +5,10 @@ gemspec
 
 gem 'guard-rspec', require: false
 
+group :test, :development do
+  gem 'pry'
+end
+
 group :test do
   gem 'rubocop'
   gem 'rubocop-rspec'

data/lib/percy.rb

@@ -15,8 +15,15 @@ module Percy
   # API client based on configured options.
   #
   # @return [Percy::Client] API client.
-  def self.client
-    @client = Percy::Client.new(config: config) if !defined?(@client) || !@client
+  def self.client(options = {})
+    if !defined?(@client) || !@client
+      @client = Percy::Client.new(
+        config: config,
+        client_info: options[:client_info],
+        environment_info: options[:environment_info],
+      )
+    end
+
     @client
   end
 

data/lib/percy/client.rb

@@ -45,10 +45,12 @@ module Percy
     class BadGatewayError < ServerError; end # 502.
     class ServiceUnavailableError < ServerError; end # 503.
 
-    attr_reader :config
+    attr_reader :config, :client_info, :environment_info
 
     def initialize(options = {})
       @config = options[:config] || Percy::Config.new
+      @client_info = options[:client_info]
+      @environment_info = options[:environment_info]
     end
   end
 end

data/lib/percy/client/builds.rb

@@ -14,6 +14,7 @@ module Percy
         # Only pass parallelism data if it all exists and there is more than 1 shard.
         in_parallel_environment = parallel_nonce && \
           parallel_total_shards && parallel_total_shards > 1
+
         unless in_parallel_environment
           parallel_nonce = nil
           parallel_total_shards = nil
@@ -44,6 +45,7 @@ module Percy
             raise ArgumentError,
               'resources argument must be an iterable of Percy::Client::Resource objects'
           end
+
           relationships_data = {
             'relationships' => {
               'resources' => {
@@ -51,16 +53,19 @@ module Percy
               },
             },
           }
+
           data['data'].merge!(relationships_data)
         end
 
         build_data = post("#{config.api_url}/repos/#{repo}/builds/", data)
         Percy.logger.debug { "Build #{build_data['data']['id']} created" }
+
         parallelism_msg = if parallel_total_shards
           "#{parallel_total_shards} shards detected (nonce: #{parallel_nonce.inspect})"
         else
           'not detected'
         end
+
         Percy.logger.debug { "Parallel test environment: #{parallelism_msg}" }
         build_data
       end

data/lib/percy/client/connection.rb

@@ -20,6 +20,7 @@ module Percy
 
         def on_complete(env)
           error_class = nil
+
           case env[:status]
           when 400
             error_class = Percy::Client::BadRequestError
@@ -42,7 +43,9 @@ module Percy
           when CLIENT_ERROR_STATUS_RANGE # Catchall.
             error_class = Percy::Client::HttpError
           end
+
           return unless error_class
+
           raise error_class.new(
             env.status, env.method.upcase, env.url, env.body,
             "Got #{env.status} (#{env.method.upcase} #{env.url}):\n#{env.body}",
@@ -52,23 +55,27 @@ module Percy
 
       def connection
         return @connection if defined?(@connection)
+
         parsed_uri = URI.parse(config.api_url)
         base_url = "#{parsed_uri.scheme}://#{parsed_uri.host}:#{parsed_uri.port}"
+
         @connection = Faraday.new(url: base_url) do |faraday|
           faraday.request :token_auth, config.access_token if config.access_token
 
           faraday.use Percy::Client::Connection::NoCookiesHTTPClientAdapter
           faraday.use Percy::Client::Connection::NiceErrorMiddleware
         end
+
         @connection
       end
 
       def get(path, options = {})
         retries = options[:retries] || 3
+
         begin
           response = connection.get do |request|
             request.url(path)
-            request.headers['Content-Type'] = 'application/vnd.api+json'
+            request.headers.merge! _headers
           end
         rescue Faraday::TimeoutError
           raise Percy::Client::TimeoutError
@@ -87,10 +94,11 @@ module Percy
 
       def post(path, data, options = {})
         retries = options[:retries] || 3
+
         begin
           response = connection.post do |request|
             request.url(path)
-            request.headers['Content-Type'] = 'application/vnd.api+json'
+            request.headers.merge! _headers
             request.body = data.to_json
           end
         rescue Faraday::TimeoutError
@@ -102,10 +110,49 @@ module Percy
             sleep(rand(1..3))
             retry
           end
+
           raise e
         end
+
         JSON.parse(response.body)
       end
+
+      def _headers
+        {
+          'Content-Type' => 'application/vnd.api+json',
+          'User-Agent' => _user_agent,
+        }
+      end
+
+      def _user_agent
+        @_user_agent ||= begin
+          client = [
+            "Percy/#{_api_version}",
+            client_info,
+            "percy-client/#{VERSION}",
+          ].compact.join(' ')
+
+          environment = [
+            environment_info,
+            "ruby/#{_ruby_version}",
+            Percy::Client::Environment.current_ci,
+          ].compact.join('; ')
+
+          "#{client} (#{environment})"
+        end
+      end
+
+      def _reset_user_agent
+        @_user_agent = nil
+      end
+
+      def _api_version
+        config.api_url.match(/\w+$/).to_s
+      end
+
+      def _ruby_version
+        "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
+      end
     end
   end
 end

data/lib/percy/client/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Client
-    VERSION = '1.12.0'.freeze
+    VERSION = '1.13.0'.freeze
   end
 end

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

@@ -55,6 +55,7 @@ RSpec.describe Percy::Client::Builds, :vcr do
       expect(build['data']['relationships']['missing-resources']['data']).to be
       expect(build['data']['relationships']['missing-resources']['data'].length).to eq(1)
     end
+
     context 'with env vars configured' do
       before(:each) do
         ENV['PERCY_BRANCH'] = 'foo-branch'

data/spec/lib/percy/client/connection_spec.rb

@@ -1,114 +1,143 @@
 RSpec.describe Percy::Client::Connection do
+  let(:user_agent) do
+    "Percy/#{api_version} #{client_info} percy-client/#{Percy::Client::VERSION} "\
+    "(#{environment_info}; ruby/#{ruby_version}; #{ci_name})"
+  end
+  let(:content_type) { 'application/vnd.api+json' }
+  let(:api_version) { 'v1' }
+  let(:ruby_version) { '2.2.6p396' }
+  let(:client_info) { 'percy-capybara/3.1.0' }
+  let(:environment_info) { 'Rails/4.2.1' }
+  let(:ci_name) { 'buildkite' }
+  let(:uri) { "#{Percy.config.api_url}/test" }
+
   describe '#connection' do
     it 'disables cookies on faraday httpclient adapter' do
       expect(Percy.client.connection.builder.app.client.cookie_manager).to be_nil
     end
   end
+
+  shared_examples_for 'a connection that sets headers with HTTP method' do |http_method|
+    it 'sets headers' do
+      stub_request(http_method, uri)
+        .with(headers: {'User-Agent' => user_agent, 'Content-Type' => content_type})
+        .to_return(body: {foo: true}.to_json)
+
+      expect(Percy.client).to receive(:_api_version).and_return(api_version)
+      expect(Percy.client).to receive(:_ruby_version).and_return(ruby_version)
+
+      expect(Percy.client).to receive(:client_info).and_return(client_info)
+      expect(Percy.client).to receive(:environment_info).and_return(environment_info)
+
+      expect(Percy::Client::Environment).to receive(:current_ci).and_return(ci_name)
+
+      expect(response).to eq('foo' => true)
+    end
+  end
+
   describe '#get' do
+    subject(:response) { Percy.client.get(uri) }
+
+    it_behaves_like 'a connection that sets headers with HTTP method', :get
+
     it 'performs a GET request to the api_url and parses response' do
-      stub_request(:get, "#{Percy.config.api_url}/test").to_return(body: {foo: true}.to_json)
-      data = Percy.client.get("#{Percy.config.api_url}/test")
-      expect(data).to eq('foo' => true)
+      stub_request(:get, uri).to_return(body: {foo: true}.to_json)
+      expect(response).to eq('foo' => true)
     end
+
     it 'raises customized timeout errors' do
-      stub_request(:get, "#{Percy.config.api_url}/test").to_raise(Faraday::TimeoutError)
-      expect do
-        Percy.client.get("#{Percy.config.api_url}/test")
-      end.to raise_error(Percy::Client::TimeoutError)
+      stub_request(:get, uri).to_raise(Faraday::TimeoutError)
+      expect { response }.to raise_error(Percy::Client::TimeoutError)
     end
+
     it 'raises customized connection failed errors' do
-      stub_request(:get, "#{Percy.config.api_url}/test").to_raise(Faraday::ConnectionFailed)
-      expect do
-        Percy.client.get("#{Percy.config.api_url}/test")
-      end.to raise_error(Percy::Client::ConnectionFailed)
+      stub_request(:get, uri).to_raise(Faraday::ConnectionFailed)
+      expect { response }.to raise_error(Percy::Client::ConnectionFailed)
     end
+
     it 'retries on 502 errors' do
-      stub_request(:get, "#{Percy.config.api_url}/test")
+      stub_request(:get, uri)
         .to_return(body: {foo: true}.to_json, status: 502)
         .then.to_return(body: {foo: true}.to_json, status: 200)
 
-      data = Percy.client.get("#{Percy.config.api_url}/test")
-      expect(data).to eq('foo' => true)
+      expect(response).to eq('foo' => true)
     end
+
     it 'raises error after 3 retries' do
-      stub_request(:get, "#{Percy.config.api_url}/test")
+      stub_request(:get, uri)
         .to_return(body: {foo: true}.to_json, status: 502).times(3)
-      expect do
-        Percy.client.get("#{Percy.config.api_url}/test")
-      end.to raise_error(Percy::Client::BadGatewayError)
+
+      expect { response }.to raise_error(Percy::Client::BadGatewayError)
     end
   end
+
   describe '#post' do
+    subject(:response) { Percy.client.post(uri, {}) }
+
+    it_behaves_like 'a connection that sets headers with HTTP method', :post
+
     it 'performs a POST request to the api_url and parses response' do
-      stub_request(:post, "#{Percy.config.api_url}/test").to_return(body: {foo: true}.to_json)
-      data = Percy.client.post("#{Percy.config.api_url}/test", {})
-      expect(data).to eq('foo' => true)
+      stub_request(:post, uri).to_return(body: {foo: true}.to_json)
+      expect(response).to eq('foo' => true)
+    end
+
+    it 'passes through arguments' do
+      stub_request(:post, uri)
+        .with(headers: {'User-Agent' => user_agent, 'Content-Type' => content_type})
+        .to_return(body: {foo: true}.to_json)
+
+      expect(Percy.client).to receive(:_user_agent).and_return(user_agent)
+      expect(response).to eq('foo' => true)
     end
+
     it 'raises customized timeout errors' do
-      stub_request(:post, "#{Percy.config.api_url}/test").to_raise(Faraday::TimeoutError)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {})
-      end.to raise_error(Percy::Client::TimeoutError)
+      stub_request(:post, uri).to_raise(Faraday::TimeoutError)
+      expect { response }.to raise_error(Percy::Client::TimeoutError)
     end
+
     it 'raises customized connection failed errors' do
-      stub_request(:post, "#{Percy.config.api_url}/test").to_raise(Faraday::ConnectionFailed)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {})
-      end.to raise_error(Percy::Client::ConnectionFailed)
+      stub_request(:post, uri).to_raise(Faraday::ConnectionFailed)
+      expect { response }.to raise_error(Percy::Client::ConnectionFailed)
     end
-    it 'raises custom error classes for some HTTP errors' do
-      stub_request(:post, "#{Percy.config.api_url}/test")
-        .to_return(body: {foo: true}.to_json, status: 400)
-        .then.to_return(body: {foo: true}.to_json, status: 401)
-        .then.to_return(body: {foo: true}.to_json, status: 402)
-        .then.to_return(body: {foo: true}.to_json, status: 403)
-        .then.to_return(body: {foo: true}.to_json, status: 404)
-        .then.to_return(body: {foo: true}.to_json, status: 409)
-        .then.to_return(body: {foo: true}.to_json, status: 500)
-        .then.to_return(body: {foo: true}.to_json, status: 502)
-        .then.to_return(body: {foo: true}.to_json, status: 503)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {}, retries: 0)
-      end.to raise_error(Percy::Client::BadRequestError)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {}, retries: 0)
-      end.to raise_error(Percy::Client::UnauthorizedError)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {}, retries: 0)
-      end.to raise_error(Percy::Client::PaymentRequiredError)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {}, retries: 0)
-      end.to raise_error(Percy::Client::ForbiddenError)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {}, retries: 0)
-      end.to raise_error(Percy::Client::NotFoundError)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {}, retries: 0)
-      end.to raise_error(Percy::Client::ConflictError)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {}, retries: 0)
-      end.to raise_error(Percy::Client::InternalServerError)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {}, retries: 0)
-      end.to raise_error(Percy::Client::BadGatewayError)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {}, retries: 0)
-      end.to raise_error(Percy::Client::ServiceUnavailableError)
+
+    shared_examples_for 'HTTP status raises custom error class' do |http_status, error_class|
+      subject(:request) { Percy.client.post(uri, {}, retries: 0) }
+
+      it 'raises custom error classes for some HTTP errors' do
+        stub_request(:post, uri).to_return(body: {foo: true}.to_json, status: http_status.to_i)
+        expect { request }.to raise_error(error_class)
+      end
+    end
+
+    http_errors = {
+      '400' => Percy::Client::BadRequestError,
+      '401' => Percy::Client::UnauthorizedError,
+      '402' => Percy::Client::PaymentRequiredError,
+      '403' => Percy::Client::ForbiddenError,
+      '404' => Percy::Client::NotFoundError,
+      '409' => Percy::Client::ConflictError,
+      '500' => Percy::Client::InternalServerError,
+      '502' => Percy::Client::BadGatewayError,
+      '503' => Percy::Client::ServiceUnavailableError,
+    }
+
+    http_errors.each do |http_status, error_class|
+      include_examples 'HTTP status raises custom error class', http_status, error_class
     end
+
     it 'retries on server errors' do
-      stub_request(:post, "#{Percy.config.api_url}/test")
+      stub_request(:post, uri)
         .to_return(body: {foo: true}.to_json, status: 500)
         .then.to_return(body: {foo: true}.to_json, status: 200)
 
-      data = Percy.client.post("#{Percy.config.api_url}/test", {})
-      expect(data).to eq('foo' => true)
+      expect(response).to eq('foo' => true)
     end
+
     it 'raises error after 3 retries' do
-      stub_request(:post, "#{Percy.config.api_url}/test")
+      stub_request(:post, uri)
         .to_return(body: {foo: true}.to_json, status: 502).times(3)
-      expect do
-        Percy.client.post("#{Percy.config.api_url}/test", {})
-      end.to raise_error(Percy::Client::BadGatewayError)
+
+      expect { response }.to raise_error(Percy::Client::BadGatewayError)
     end
   end
 end

data/spec/lib/percy/client/environment_spec.rb

@@ -88,6 +88,7 @@ RSpec.describe Percy::Client::Environment do
     }
     clear_env_vars
   end
+
   after(:each) do
     clear_env_vars
     ENV['TRAVIS_BUILD_ID'] = @original_env['TRAVIS_BUILD_ID']
@@ -106,41 +107,50 @@ RSpec.describe Percy::Client::Environment do
         expect(Percy::Client::Environment.current_ci).to be_nil
       end
     end
+
     describe '#branch' do
       it 'returns master if not in a git repo' do
         expect(Percy::Client::Environment).to receive(:_raw_branch_output).and_return('')
         expect(Percy::Client::Environment.branch).to eq('master')
       end
+
       it 'reads from the current local repo' do
         expect(Percy::Client::Environment.branch).to_not be_empty
       end
+
       it 'can be overridden with PERCY_BRANCH' do
         ENV['PERCY_BRANCH'] = 'test-branch'
         expect(Percy::Client::Environment.branch).to eq('test-branch')
       end
     end
+
     describe '#target_branch' do
       it 'returns nil if unset' do
         expect(Percy::Client::Environment.target_branch).to be_nil
       end
+
       it 'can be set with PERCY_TARGET_BRANCH' do
         ENV['PERCY_TARGET_BRANCH'] = 'test-target-branch'
         expect(Percy::Client::Environment.target_branch).to eq('test-target-branch')
       end
     end
+
     describe '#_commit_sha' do
       it 'returns nil if no environment info can be found' do
         expect(Percy::Client::Environment._commit_sha).to be_nil
       end
+
       it 'can be overridden with PERCY_COMMIT' do
         ENV['PERCY_COMMIT'] = 'test-commit'
         expect(Percy::Client::Environment._commit_sha).to eq('test-commit')
       end
     end
+
     describe '#pull_request_number' do
       it 'returns nil if no CI environment' do
         expect(Percy::Client::Environment.pull_request_number).to be_nil
       end
+
       it 'can be overridden with PERCY_PULL_REQUEST' do
         ENV['PERCY_PULL_REQUEST'] = '123'
         ENV['TRAVIS_BUILD_ID'] = '1234'
@@ -148,18 +158,22 @@ RSpec.describe Percy::Client::Environment do
         expect(Percy::Client::Environment.pull_request_number).to eq('123')
       end
     end
+
     describe '#repo' do
       it 'returns the current local repo name' do
         expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
       end
+
       it 'can be overridden with PERCY_PROJECT' do
         ENV['PERCY_PROJECT'] = 'percy/slug'
         expect(Percy::Client::Environment.repo).to eq('percy/slug')
       end
+
       it 'can be overridden with PERCY_REPO_SLUG (deprecated)' do
         ENV['PERCY_REPO_SLUG'] = 'percy/slug'
         expect(Percy::Client::Environment.repo).to eq('percy/slug')
       end
+
       it 'handles git ssh urls' do
         expect(Percy::Client::Environment).to receive(:_get_origin_url)
           .once.and_return('git@github.com:org-name/repo-name.git')
@@ -173,6 +187,7 @@ RSpec.describe Percy::Client::Environment do
           .once.and_return('git@custom-local-hostname:org-name/repo-name.org')
         expect(Percy::Client::Environment.repo).to eq('org-name/repo-name.org')
       end
+
       it 'handles git https urls' do
         expect(Percy::Client::Environment).to receive(:_get_origin_url)
           .once.and_return('https://github.com/org-name/repo-name.git')
@@ -186,6 +201,7 @@ RSpec.describe Percy::Client::Environment do
           .once.and_return("https://github.com/org-name/repo-name.org\n")
         expect(Percy::Client::Environment.repo).to eq('org-name/repo-name.org')
       end
+
       it 'errors if unable to parse local repo name' do
         expect(Percy::Client::Environment).to receive(:_get_origin_url).once.and_return('foo')
         expect { Percy::Client::Environment.repo }.to raise_error(
@@ -193,25 +209,38 @@ RSpec.describe Percy::Client::Environment do
         )
       end
     end
+
     describe '#parallel_nonce' do
       it 'returns nil' do
         expect(Percy::Client::Environment.parallel_nonce).to be_nil
       end
+
       it 'can be set with environment var' do
         ENV['PERCY_PARALLEL_NONCE'] = 'nonce'
         expect(Percy::Client::Environment.parallel_nonce).to eq('nonce')
       end
     end
+
     describe '#parallel_total_shards' do
       it 'returns nil' do
         expect(Percy::Client::Environment.parallel_nonce).to be_nil
       end
+
       it 'can be set with environment var' do
         ENV['PERCY_PARALLEL_TOTAL'] = '3'
         expect(Percy::Client::Environment.parallel_total_shards).to eq(3)
       end
     end
   end
+
+  RSpec.shared_examples 'an environment user agent that includes CI' do |ci_name|
+    it 'returns a user_agent that includes CI name' do
+      user_agent = "Percy/v1 percy-client/#{Percy::Client::VERSION} "\
+                   "(ruby/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; #{ci_name})"
+      expect(Percy::Client::Environment.user_agent).to eq user_agent
+    end
+  end
+
   context 'in Jenkins CI' do
     before(:each) do
       ENV['JENKINS_URL'] = 'http://localhost:8080/'
@@ -228,6 +257,7 @@ RSpec.describe Percy::Client::Environment do
       expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
     end
   end
+
   context 'in Travis CI' do
     before(:each) do
       ENV['TRAVIS_BUILD_ID'] = '1234'
@@ -250,28 +280,33 @@ RSpec.describe Percy::Client::Environment do
       expect(Percy::Client::Environment.parallel_nonce).to eq('build-number')
       expect(Percy::Client::Environment.parallel_total_shards).to be_nil
     end
+
     context 'Pull Request build' do
       before(:each) do
         ENV['TRAVIS_PULL_REQUEST'] = '256'
         ENV['TRAVIS_PULL_REQUEST_BRANCH'] = 'travis-pr-branch'
         ENV['TRAVIS_PULL_REQUEST_SHA'] = 'travis-pr-head-commit-sha'
       end
+
       it 'has the correct properties' do
         expect(Percy::Client::Environment.branch).to eq('travis-pr-branch')
         expect(Percy::Client::Environment._commit_sha).to eq('travis-pr-head-commit-sha')
         expect(Percy::Client::Environment.pull_request_number).to eq('256')
       end
     end
+
     context 'parallel build' do
       before(:each) do
         ENV['CI_NODE_TOTAL'] = '3'
       end
+
       it 'has the correct properties' do
         expect(Percy::Client::Environment.parallel_nonce).to eq('build-number')
         expect(Percy::Client::Environment.parallel_total_shards).to eq(3)
       end
     end
   end
+
   context 'in Circle CI' do
     before(:each) do
       ENV['CIRCLECI'] = 'true'
@@ -293,16 +328,19 @@ RSpec.describe Percy::Client::Environment do
       expect(Percy::Client::Environment.parallel_nonce).to eq('build-number')
       expect(Percy::Client::Environment.parallel_total_shards).to be_nil
     end
+
     context 'parallel build' do
       before(:each) do
         ENV['CIRCLE_NODE_TOTAL'] = '3'
       end
+
       it 'has the correct properties' do
         expect(Percy::Client::Environment.parallel_nonce).to eq('build-number')
         expect(Percy::Client::Environment.parallel_total_shards).to eq(3)
       end
     end
   end
+
   context 'in Codeship' do
     before(:each) do
       ENV['CI_NAME'] = 'codeship'
@@ -322,16 +360,19 @@ RSpec.describe Percy::Client::Environment do
       expect(Percy::Client::Environment.parallel_nonce).to eq('codeship-build-number')
       expect(Percy::Client::Environment.parallel_total_shards).to be_nil
     end
+
     context 'parallel build' do
       before(:each) do
         ENV['CI_NODE_TOTAL'] = '3'
       end
+
       it 'has the correct properties' do
         expect(Percy::Client::Environment.parallel_nonce).to eq('codeship-build-number')
         expect(Percy::Client::Environment.parallel_total_shards).to eq(3)
       end
     end
   end
+
   context 'in Drone' do
     before(:each) do
       ENV['DRONE'] = 'true'
@@ -348,6 +389,7 @@ RSpec.describe Percy::Client::Environment do
       expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
     end
   end
+
   context 'in Semaphore CI' do
     before(:each) do
       ENV['SEMAPHORE'] = 'true'
@@ -368,16 +410,19 @@ RSpec.describe Percy::Client::Environment do
       expect(Percy::Client::Environment.parallel_nonce).to eq('semaphore-build-number')
       expect(Percy::Client::Environment.parallel_total_shards).to be_nil
     end
+
     context 'parallel build' do
       before(:each) do
         ENV['SEMAPHORE_THREAD_COUNT'] = '3'
       end
+
       it 'has the correct properties' do
         expect(Percy::Client::Environment.parallel_nonce).to eq('semaphore-build-number')
         expect(Percy::Client::Environment.parallel_total_shards).to eq(3)
       end
     end
   end
+
   context 'in Buildkite' do
     before(:each) do
       ENV['BUILDKITE'] = 'true'

data/spec/spec_helper.rb

@@ -28,4 +28,10 @@ RSpec.configure do |config|
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
+
+  config.after(:each) do |_example|
+    # After each run, clear the memoized `_user_agent` property to avoid polluting
+    # other tests with the incorrect values.
+    Percy.client._reset_user_agent
+  end
 end

data/spec/support/vcr_setup.rb

@@ -5,6 +5,10 @@ VCR.configure do |c|
   c.cassette_library_dir = 'spec/cassettes'
   c.hook_into :webmock
 
+  # Uncomment this to get VCR logger debugging.
+  # Run: `rspec spec vcr.log` to get debugging output to vcr.log
+  # c.debug_logger = File.open(ARGV[1], 'w')
+
   c.default_cassette_options = {
     record: ENV['RECORD'] ? :new_episodes : :none,
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Percy::Client