percy-client 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91dde3564fe8e518402afa26ee2f52d5690ae688
-  data.tar.gz: 4653d42a6fe35bbf4f55e97a4b181ced166b63b8
+  metadata.gz: ff13681ebc6ba8462ab1bab83f05778d7a3ea23b
+  data.tar.gz: 9f7c57003c03986c9f8b71e3e465d97cd4204a87
 SHA512:
-  metadata.gz: 503bad70215a73b1c78ca2aa617c29f1a84baff8b6d5adee4270ed34885a3ad31b333775062045479e7588d580a9d1db34b6856b0b39f0d59509740057a851de
-  data.tar.gz: 30a2bbcc431217f32c1afd707440641fe166a9d81951680e507c2dcf778a3f27820f4cd82a2213dbd97401ed04c1cb186e0213255df67d1f1d2bf13b843cbbd0
+  metadata.gz: 9c4e58df2f2171d01cc43d95ea2d3890909f3eb8bd02f935def23741dc3bb959a53a51aa7439cc54b080780823d0a94a4aa0b7fe16bf597377da227e43635003
+  data.tar.gz: cf6dfba7f7ef13d152a86ebc09ae9d0fa9fa9ab2723ac3f47fb5f113dd991e102fb01e864a83db9a3e5c736e4fa8e9662d63672feac8462d6cb6bdb2f958c128

data/lib/percy/client/environment.rb

@@ -90,7 +90,11 @@ module Percy
         when :jenkins
           ENV['ghprbTargetBranch']
         when :travis
-          ENV['TRAVIS_BRANCH']
+          if pull_request_number && ENV['TRAVIS_BRANCH'] == 'master'
+            "github-pr-#{pull_request_number}"
+          else
+            ENV['TRAVIS_BRANCH']
+          end
         when :circle
           ENV['CIRCLE_BRANCH']
         when :codeship

data/lib/percy/client/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Client
-    VERSION = '1.4.0'
+    VERSION = '1.4.1'
   end
 end

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

@@ -230,6 +230,14 @@ RSpec.describe Percy::Client::Environment do
       it 'reads from the CI environment' do
         expect(Percy::Client::Environment.branch).to eq('travis-branch')
       end
+      it 'renames the Percy branch if this is a PR with an unknown head branch' do
+        # Note: this is very unfortunately necessary because Travis does not expose the head branch,
+        # only the targeted branch in TRAVIS_BRANCH and no way to get the actual head PR branch.
+        # We create a fake branch name so that Percy does not mistake this PR as a new master build.
+        # https://github.com/travis-ci/travis-ci/issues/1633#issuecomment-194749671
+        ENV['TRAVIS_BRANCH'] = 'master'
+        expect(Percy::Client::Environment.branch).to eq('github-pr-256')
+      end
     end
     describe '#_commit_sha' do
       it 'reads from the CI environment' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Percy::Client
@@ -196,3 +196,4 @@ test_files:
 - spec/lib/percy_spec.rb
 - spec/spec_helper.rb
 - spec/support/vcr_setup.rb
+has_rdoc: