percy-capybara 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ffda7d1edb1b8af63b836b222198c91f5b4123b
-  data.tar.gz: 0a4530980562b8eee91a122ccb605c10376d8d9f
+  metadata.gz: 1f2c6b66630a9b989903633853eb47c1d74595a7
+  data.tar.gz: 1a747e278afafb60039383ec401c8d20b1cdb5f3
 SHA512:
-  metadata.gz: 0b80f67fc99db1389d5c3dbc9b3e743d4ccc3ba87cde1db6e6397e056457a3d85a20233ecdff8d291108a66f0e00848f56642e899f85c2d96259e48b4e3a0442
-  data.tar.gz: 84c9e112198d7d43f46519d639ae9dc9ee620fac769331a5e43eccdaeb253f507bc51c2dc91bf3c826dae0f08034d0dd954b950986fc03621936a97a145c3558
+  metadata.gz: 6e134b285b13d3fdf24a305a7f79a1701c8a2defa16e0105de781da019484d80e8a8390915fb6b579d4834bd3eddeefde3a254850a649760b23ed225d59f85f8
+  data.tar.gz: 519a72136a56740eaec3c8f7dbd56dbbc10eb0ebae3d5b145cc10025c89306e569b84a11c1da85ac904900d7471d3179cc5411cb7766b8a7ad789eddbb18e504

data/.rubocop.yml

@@ -5,9 +5,18 @@ AllCops:
     - Rakefile
     - lib/**/*.rake
 
+Lint/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
 Metrics/LineLength:
   Max: 100
 
+Style/CaseIndentation:
+  EnforcedStyle: end
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
 Style/Documentation:
   Enabled: false
 
@@ -23,20 +32,32 @@ Style/MultilineMethodCallIndentation:
 Style/MultilineOperationIndentation:
   EnforcedStyle: indented
 
+# Disable Style/NumericLiterals so numbers don't need underscores
+Style/NumericLiterals:
+  Enabled: false
+
+Style/NumericPredicate:
+  EnforcedStyle: comparison
+
 Style/RedundantBegin:
   Enabled: false
 
+Style/RegexpLiteral:
+  EnforcedStyle: slashes
+  AllowInnerSlashes: true
+
 Style/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: consistent_comma
+
 Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: comma
+  EnforcedStyleForMultiline: consistent_comma
 
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-
-
 # Will be able to do this in >= v1.11
 # RSpec/DescribedClass:
 #   EnforcedStyle: explicit

data/.rubocop_todo.yml

@@ -13,12 +13,12 @@ Metrics/AbcSize:
 # Offense count: 27
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 227
+  Max: 300
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 164
+  Max: 200
 
 # Offense count: 5
 Metrics/CyclomaticComplexity:
@@ -67,8 +67,7 @@ RSpec/MultipleExpectations:
 # Offense count: 1
 # Configuration parameters: Max.
 RSpec/NestedGroups:
-  Exclude:
-    - 'spec/lib/percy/capybara/loaders/sprockets_loader_spec.rb'
+  Enabled: false
 
 # Offense count: 10
 # Configuration parameters: IgnoreSymbolicNames.
@@ -81,17 +80,6 @@ RSpec/VerifiedDoubles:
     - 'spec/lib/percy/capybara_spec.rb'
     - 'spec/support/test_helpers.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'lib/percy/capybara/loaders/native_loader.rb'
-    - 'spec/lib/percy/capybara/loaders/native_loader_spec.rb'
-    - 'spec/lib/percy/capybara/loaders/sprockets_loader_spec.rb'
-    - 'spec/support/test_helpers.rb'
-
 # Offense count: 1
 Style/StructInheritance:
   Exclude:

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

@@ -40,7 +40,7 @@ module Percy
           return unless enabled?  # Silently skip if the client is disabled.
           unless build_initialized?
             raise Percy::Capybara::Client::BuildNotInitializedError,
-                  'Failed to finalize build because no build has been initialized.'
+              'Failed to finalize build because no build has been initialized.'
           end
           result = rescue_connection_failures do
             client.finalize_build(current_build['data']['id'])
@@ -66,7 +66,7 @@ module Percy
             resource = build_resources.find { |r| r.sha == sha }
             content = resource.content || File.read(resource.path)
             client.upload_resource(current_build['data']['id'], content)
-            if (i % 10).zero?
+            if (i % 10) == 0
               puts "[percy] Uploading #{i + 1} of #{new_build_resources.length} new resources..."
             end
           end

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

@@ -29,7 +29,7 @@ module Percy
           # port number
           '(:\\d{2,5})?' +
           # resource path
-          "(/[^\\s\"']*)?"
+          "(/[^\\s\"']*)?",
         )
 
         attr_reader :page
@@ -50,7 +50,7 @@ module Percy
         # @private
         def root_html_resource
           Percy::Client::Resource.new(
-            current_path, is_root: true, mimetype: 'text/html', content: page.html
+            current_path, is_root: true, mimetype: 'text/html', content: page.html,
           )
         end
 
@@ -92,7 +92,7 @@ module Percy
                   path,
                   content: content,
                   sha: sha,
-                  mimetype: 'text/html'
+                  mimetype: 'text/html',
                 )
             end
           end

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

@@ -17,6 +17,12 @@ module Percy
           '0.0.0.0',
         ].freeze
 
+        def initialize(options = {})
+          super(options)
+
+          @asset_hostnames = options[:asset_hostnames] || []
+        end
+
         def snapshot_resources
           resources = []
           resources << root_html_resource
@@ -77,7 +83,7 @@ module Percy
             _absolute_url_to_relative!(url, _current_host_port)
             next unless response
             resources << Percy::Client::Resource.new(
-              url, mimetype: 'text/css', content: response.body
+              url, mimetype: 'text/css', content: response.body,
             )
           end
           resources
@@ -164,7 +170,7 @@ module Percy
             next unless response
 
             resources << Percy::Client::Resource.new(
-              resource_url, mimetype: response.content_type, content: response.body
+              resource_url, mimetype: response.content_type, content: response.body,
             )
           end
           resources
@@ -204,7 +210,7 @@ module Percy
           # Is not a remote URL.
           if url_match && !data_url_match
             host = url_match[2]
-            result = LOCAL_HOSTNAMES.include?(host) || _same_server?(url, _current_host_port)
+            result = asset_hostnames.include?(host) || _same_server?(url, _current_host_port)
           end
 
           !!result
@@ -215,17 +221,24 @@ module Percy
           url_match = URL_REGEX.match(page.current_url)
           url_match[1] + url_match[2] + (url_match[3] || '')
         end
+        private :_current_host_port
 
         # @private
         def _same_server?(url, host_port)
           url.start_with?(host_port + '/') || url == host_port
         end
+        private :_same_server?
 
         # @private
         def _absolute_url_to_relative!(url, host_port)
           url.gsub!(host_port + '/', '/') if url.start_with?(host_port + '/')
         end
         private :_absolute_url_to_relative!
+
+        def asset_hostnames
+          LOCAL_HOSTNAMES + @asset_hostnames
+        end
+        private :asset_hostnames
       end
     end
   end

data/lib/percy/capybara/version.rb

@@ -1,5 +1,5 @@
 module Percy
   module Capybara
-    VERSION = '2.4.1'.freeze
+    VERSION = '2.4.2'.freeze
   end
 end

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

@@ -76,7 +76,7 @@ RSpec.describe Percy::Capybara::Client::Snapshots, type: :feature do
           .and_call_original
 
         result = capybara_client.snapshot(
-          page, name: 'foo', widths: [320, 1024], enable_javascript: true
+          page, name: 'foo', widths: [320, 1024], enable_javascript: true,
         )
         expect(result).to eq(true)
         expect(capybara_client.failed?).to eq(false)

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

@@ -4,7 +4,7 @@ RSpec.describe Percy::Capybara::HttpFetcher do
 
     # Slightly magical hash, just a SHA-256 sum of the image above.
     expect(Digest::SHA256.hexdigest(response.body)).to eq(
-      '4beb51550bef8e9e30d37ea8c13658e99bb01722062f218185e419af5ad93e13'
+      '4beb51550bef8e9e30d37ea8c13658e99bb01722062f218185e419af5ad93e13',
     )
     expect(response.content_type).to eq('image/png')
   end

data/spec/lib/percy/capybara/loaders/native_loader_spec.rb

@@ -1,6 +1,7 @@
 RSpec.describe Percy::Capybara::Loaders::NativeLoader do
   let(:fake_page) { OpenStruct.new(current_url: 'http://localhost/foo') }
-  let(:loader) { described_class.new(page: fake_page) }
+  let(:asset_hostnames) { nil }
+  let(:loader) { described_class.new(page: fake_page, asset_hostnames: asset_hostnames) }
 
   describe '#build_resources' do
     it 'returns an empty list' do
@@ -17,32 +18,36 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       visit '/test-css.html'
       loader = described_class.new(page: page)
       resource_urls = loader.snapshot_resources.collect(&:resource_url)
-      expect(resource_urls).to match_array([
-        '/test-css.html',
-        '/css/base.css',
-        '/css/imports.css',
-        '/css/level0-imports.css',
-        '/css/level1-imports.css',
-        '/css/level2-imports.css',
-        '/css/simple-imports.css',
-      ])
+      expect(resource_urls).to match_array(
+        [
+          '/test-css.html',
+          '/css/base.css',
+          '/css/imports.css',
+          '/css/level0-imports.css',
+          '/css/level1-imports.css',
+          '/css/level2-imports.css',
+          '/css/simple-imports.css',
+        ],
+      )
     end
     it 'returns the root HTML and image resources' do
       visit '/test-images.html'
       loader = described_class.new(page: page)
       resource_urls = loader.snapshot_resources.collect(&:resource_url)
-      expect(resource_urls).to match_array([
-        '/test-images.html',
-        '/images/img-relative.png',
-        '/images/img-relative-to-root.png',
-        '/images/percy.svg',
-        '/images/srcset-base.png',
-        '/images/srcset-first.png',
-        '/images/srcset-second.png',
-        '/images/bg-relative.png',
-        '/images/bg-relative-to-root.png',
-        '/images/bg-stacked.png',
-      ])
+      expect(resource_urls).to match_array(
+        [
+          '/test-images.html',
+          '/images/img-relative.png',
+          '/images/img-relative-to-root.png',
+          '/images/percy.svg',
+          '/images/srcset-base.png',
+          '/images/srcset-first.png',
+          '/images/srcset-second.png',
+          '/images/bg-relative.png',
+          '/images/bg-relative-to-root.png',
+          '/images/bg-stacked.png',
+        ],
+      )
     end
   end
   describe 'nonlocal.me', type: :feature, js: true do
@@ -57,10 +62,12 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       visit '/test-localtest-me-images.html'
       loader = described_class.new(page: page)
       resource_urls = loader.snapshot_resources.collect(&:resource_url)
-      expect(resource_urls).to eq([
-        '/test-localtest-me-images.html',
-        '/images/img-relative.png',
-      ])
+      expect(resource_urls).to eq(
+        [
+          '/test-localtest-me-images.html',
+          '/images/img-relative.png',
+        ],
+      )
       expect(loader.snapshot_resources.collect(&:is_root)).to eq([true, nil])
     end
   end
@@ -91,11 +98,29 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
     it 'returns false for data URLs' do
       expect(loader._should_include_url?('data:image/gif;base64,R0')).to eq(false)
     end
-    it 'returns false for remote URLs' do
-      expect(loader._should_include_url?('http://foo/')).to eq(false)
-      expect(loader._should_include_url?('http://example.com/')).to eq(false)
-      expect(loader._should_include_url?('http://example.com/foo')).to eq(false)
-      expect(loader._should_include_url?('https://example.com/foo')).to eq(false)
+
+    context 'when loader is initialised with asset hostnames' do
+      let(:asset_hostnames) { ['dev.local'] }
+      context 'with the same port' do
+        it 'returns in accordance with asset_hostnames' do
+          expect(loader._should_include_url?('http://dev.local/')).to eq(true)
+          expect(loader._should_include_url?('http://dev.local/foo')).to eq(true)
+
+          expect(loader._should_include_url?('http://other.local/')).to eq(false)
+        end
+      end
+      context 'with different port' do
+        it 'returns in accordance with asset_hostnames' do
+          expect(loader._should_include_url?('http://dev.local:4321/foo')).to eq(true)
+          expect(loader._should_include_url?('http://other.local:1234/foo')).to eq(false)
+        end
+      end
+      context 'https' do
+        it 'returns in accordance with asset_hostnames' do
+          expect(loader._should_include_url?('https://dev.local/foo')).to eq(true)
+          expect(loader._should_include_url?('https://other.local/foo')).to eq(false)
+        end
+      end
     end
     context 'for nonlocal hosts' do
       let(:fake_page) { OpenStruct.new(current_url: 'http://foo:123/') }
@@ -238,17 +263,19 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       expect(resource.sha).to eq(expected_sha)
 
       resource_urls = resources.collect(&:resource_url)
-      expect(resource_urls).to match_array([
-        '/images/img-relative.png',
-        '/images/img-relative-to-root.png',
-        '/images/percy.svg',
-        '/images/srcset-base.png',
-        '/images/srcset-first.png',
-        '/images/srcset-second.png',
-        '/images/bg-relative.png',
-        '/images/bg-relative-to-root.png',
-        '/images/bg-stacked.png',
-      ])
+      expect(resource_urls).to match_array(
+        [
+          '/images/img-relative.png',
+          '/images/img-relative-to-root.png',
+          '/images/percy.svg',
+          '/images/srcset-base.png',
+          '/images/srcset-first.png',
+          '/images/srcset-second.png',
+          '/images/bg-relative.png',
+          '/images/bg-relative-to-root.png',
+          '/images/bg-stacked.png',
+        ],
+      )
       expect(resources.collect(&:is_root).uniq).to match_array([nil])
     end
   end

data/spec/lib/percy/capybara/loaders/sprockets_loader_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
     described_class.new(
       page: page,
       sprockets_environment: environment,
-      sprockets_options: sprockets_options
+      sprockets_options: sprockets_options,
     )
   end
   let(:environment) do

data/spec/spec_helper.rb

@@ -62,9 +62,11 @@ RSpec.configure do |config|
 
     # Note: using this form of popen to keep stdout and stderr silent and captured.
     dir = File.expand_path('../lib/percy/capybara/client/testdata/', __FILE__)
-    @process = IO.popen([
-      'ruby', '-run', '-e', 'httpd', dir, '-p', port.to_s, err: [:child, :out]
-    ].flatten)
+    @process = IO.popen(
+      [
+        'ruby', '-run', '-e', 'httpd', dir, '-p', port.to_s, err: [:child, :out],
+      ].flatten,
+    )
 
     # Block until the server is up.
     WebMock.disable_net_connect!(allow_localhost: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-capybara
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: percy-client