percy-capybara 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ba34ea074b4869f59bc97456d10244725ab00c4
-  data.tar.gz: c582901df940381843c536adae6b12cf925de398
+  metadata.gz: ed27f266ef0e576151ac70938bddc265d93a7326
+  data.tar.gz: 253e5f65a6f255e98dc52e88d2f9a806cb091b96
 SHA512:
-  metadata.gz: 8a6b638286d1e7be3567b2e72c8a3ae8ba24e0da8f0cb3491d6caf49b1a1f22424db100ed1d168b335aa86bde8f05b5dc4c7f5f607e55360ba68b3e277b6090d
-  data.tar.gz: 551f496366ba9956bb969d1b9d400cace00bcb87faa62059bb298077d445793e9ffd51216563cc5c97c68dd669871e7d271535cc8d72b84ce4cf8e7d3ad6ac10
+  metadata.gz: 9e6754504ab9ac10ba315f47ef1282bae231f2821a7d91d7c06c78eea33ac44923fcaff8c89425999351b29a6c48abab8fb5353e37ad41358eeedde79bd0afb5
+  data.tar.gz: 286f90600e73f448a0a99157eb022add0e0eb03f1ef7c79eea4459b6ef6ab0e1396d0cfabe63456363bc71c468f722e60477750935897a88fc9e02965c09b911

data/.rubocop.yml

@@ -58,6 +58,9 @@ Style/TrailingCommaInLiteral:
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
+RSpec/ExampleLength:
+  Enabled: false
+
 Style/FileName:
   Exclude:
     - 'Gemfile'

data/lib/percy/capybara/client.rb

@@ -3,6 +3,7 @@ require 'percy/capybara/client/snapshots'
 require 'percy/capybara/loaders/filesystem_loader'
 require 'percy/capybara/loaders/native_loader'
 require 'percy/capybara/loaders/sprockets_loader'
+require 'percy/capybara/loaders/ember_cli_rails_loader'
 
 module Percy
   module Capybara
@@ -83,6 +84,14 @@ module Percy
 
       def initialize_loader(options = {})
         merged_options = loader_options.merge(options)
+
+        is_sprockets = sprockets_environment && sprockets_options
+
+        if is_sprockets
+          merged_options[:sprockets_environment] = sprockets_environment
+          merged_options[:sprockets_options]     = sprockets_options
+        end
+
         if loader
           case loader
           when :filesystem
@@ -91,14 +100,16 @@ module Percy
           when :native
             Percy.logger.debug { 'Using native_loader to discover assets (slow).' }
             Percy::Capybara::Loaders::NativeLoader.new(merged_options)
+          when :ember_cli_rails
+            Percy.logger.debug { 'Using ember_cli_rails_loader to discover assets.' }
+            mounted_apps = merged_options.delete(:mounted_apps)
+            Percy::Capybara::Loaders::EmberCliRailsLoader.new(mounted_apps, merged_options)
           else
             Percy.logger.debug { 'Using a custom loader to discover assets.' }
             loader.new(merged_options)
           end
-        elsif sprockets_environment && sprockets_options
+        elsif is_sprockets
           Percy.logger.debug { 'Using sprockets_loader to discover assets.' }
-          merged_options[:sprockets_environment] = sprockets_environment
-          merged_options[:sprockets_options] = sprockets_options
           Percy::Capybara::Loaders::SprocketsLoader.new(merged_options)
         else
           unless @warned_about_native_loader

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

@@ -34,6 +34,13 @@ module Percy
           "(/[^\\s\"']*)?",
         )
 
+        SKIP_RESOURCE_EXTENSIONS = [
+          '.map', # Ignore source maps.
+          '.gz', # Ignore gzipped files.
+        ].freeze
+
+        MAX_FILESIZE_BYTES = 15 * 1024**2 # 15 MB.
+
         attr_reader :page
 
         # @param [Capybara::Session] page The Capybara page.
@@ -109,6 +116,34 @@ module Percy
         rescue ::Capybara::NotSupportedByDriverError
           []
         end
+
+        def _resources_from_dir(root_dir, base_url: '/')
+          resources = []
+
+          Find.find(root_dir).each do |path|
+            # Skip directories.
+            next unless FileTest.file?(path)
+            # Skip certain extensions.
+            next if SKIP_RESOURCE_EXTENSIONS.include?(File.extname(path))
+            # Skip large files, these are hopefully downloads and not used in page rendering.
+            next if File.size(path) > MAX_FILESIZE_BYTES
+
+            # Replace the assets_dir with the base_url to generate the resource_url
+            resource_url = _uri_join(base_url, path.sub(root_dir.to_s, ''))
+
+            sha = Digest::SHA256.hexdigest(File.read(path))
+
+            resources << Percy::Client::Resource.new(resource_url, sha: sha, path: path)
+          end
+
+          resources
+        end
+
+        def _uri_join(*paths)
+          # We must swap File::SEPARATOR for '/' here because on Windows File.join
+          # will use backslashes and this is a URL.
+          File.join(paths).gsub(File::SEPARATOR, '/')
+        end
       end
     end
   end

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

@@ -0,0 +1,50 @@
+require 'percy/capybara/loaders/sprockets_loader'
+
+module Percy
+  module Capybara
+    module Loaders
+      class EmberCliRailsLoader < SprocketsLoader
+        attr_reader :mounted_apps
+
+        EMBER_ASSETS_DIR = 'assets'.freeze
+
+        def initialize(mounted_apps, options = {})
+          super(options)
+
+          raise 'mounted_apps is required' unless mounted_apps
+          @mounted_apps = mounted_apps
+        end
+
+        def build_resources
+          resources = []
+
+          @mounted_apps.map do |app_name, mount_path|
+            # public assets path for this particular ember app. If the app is mounted on /admin
+            # the output would be: /admin/assets
+            base_assets_url = File.join(mount_path, EMBER_ASSETS_DIR)
+
+            # full path on disk to the assets for this ember app
+            # e.g. /Users/djones/Code/rails-ember-app/tmp/ember-cli/apps/frontend
+            dist_path = _dist_path_for_app(app_name)
+
+            # full path to the directory on disk where ember stores assets for this ember app
+            # e.g. /Users/djones/Code/rails-ember-app/tmp/ember-cli/apps/frontend/assets
+            ember_assets_path = File.join(dist_path, EMBER_ASSETS_DIR)
+
+            resources += _resources_from_dir(ember_assets_path, base_url: base_assets_url)
+          end
+
+          resources += super # adds sprockets resources from Rails
+        end
+
+        def _dist_path_for_app(app_name)
+          _ember_cli.apps[app_name].dist_path
+        end
+
+        def _ember_cli
+          EmberCli if defined?(EmberCli)
+        end
+      end
+    end
+  end
+end

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

@@ -8,12 +8,6 @@ module Percy
     module Loaders
       # Resource loader that looks for resources in the specified folder.
       class FilesystemLoader < BaseLoader
-        SKIP_RESOURCE_EXTENSIONS = [
-          '.map', # Ignore source maps.
-          '.gz', # Ignore gzipped files.
-        ].freeze
-        MAX_FILESIZE_BYTES = 15 * 1024**2 # 15 MB.
-
         def initialize(options = {})
           # @assets_dir should point to a _compiled_ static assets directory, not source assets.
           @assets_dir = options[:assets_dir]
@@ -35,22 +29,7 @@ module Percy
         end
 
         def build_resources
-          resources = []
-          Find.find(@assets_dir).each do |path|
-            # Skip directories.
-            next unless FileTest.file?(path)
-            # Skip certain extensions.
-            next if SKIP_RESOURCE_EXTENSIONS.include?(File.extname(path))
-            # Skip large files, these are hopefully downloads and not used in page rendering.
-            next if File.size(path) > MAX_FILESIZE_BYTES
-
-            # Replace the assets_dir with the base_url to generate the resource_url
-            resource_url = @base_url.chomp('/') + path.sub(@assets_dir, '')
-
-            sha = Digest::SHA256.hexdigest(File.read(path))
-            resources << Percy::Client::Resource.new(resource_url, sha: sha, path: path)
-          end
-          resources
+          _resources_from_dir(@assets_dir, base_url: @base_url)
         end
       end
     end

data/lib/percy/capybara/version.rb

@@ -1,5 +1,5 @@
 module Percy
   module Capybara
-    VERSION = '2.5.1'.freeze
+    VERSION = '2.6.0'.freeze
   end
 end

data/spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/index.html

@@ -0,0 +1 @@
+<html><head></head><body>Hello World!</body></html>

data/spec/lib/percy/capybara/client/test_data/images/percy.svg

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 170 110" enable-background="new 0 0 170 110" xml:space="preserve">
+<g>
+	<g>
+		<polyline fill="#1F0924" points="49.2,97.6 9.4,103.4 46,86.8 6.2,81.2 46,75.6 9.4,59 49.2,64.9 18.7,38.6 55.2,55.4 33.4,21.7 
+			63.7,48.1 52.2,9.6 73.9,43.4 73.7,3.2 85,41.8 96.2,3.2 96.1,43.4 117.7,9.5 106.3,48.1 136.5,21.6 114.7,55.4 151.2,38.6 
+			120.8,64.8 160.6,59 124,75.6 163.8,81.1 124,86.8 160.6,103.3 120.8,97.5 		"/>
+		<polyline fill="#EDDDC2" points="52.8,90.2 18.5,90.3 51.4,80.7 18.5,71.2 52.8,71.3 23.9,52.8 56.8,62.6 63,55.4 48.7,24.2 
+			71.1,50.2 66.1,16.3 80.2,47.5 85,13.5 89.8,47.5 103.9,16.3 98.9,50.2 121.3,24.2 107,55.4 113.2,62.6 146.1,52.8 117.2,71.3 
+			151.5,71.2 118.6,80.7 151.5,90.3 117.2,90.2 		"/>
+	</g>
+	<polygon fill="#EDDDC2" points="108.3,45.7 134.4,39.1 127.9,65.2 	"/>
+	<polygon fill="#1F0924" points="114.2,48.6 128.5,45 124.9,59.3 114.2,59.3 	"/>
+	<polygon fill="#EDDDC2" points="61.7,45.7 35.6,39.1 42.1,65.2 	"/>
+	<polygon fill="#1F0924" points="55.8,48.6 41.5,45 45.1,59.3 55.8,59.3 	"/>
+	<polyline fill="#B157B5" points="38.3,101.1 131.7,101.1 166.8,88.5 131.5,76 155.8,47.6 119,54.5 125.9,17.7 97.5,42 85,6.7 
+		72.5,42 44.1,17.7 51,54.5 14.2,47.6 38.5,76 3.2,88.5 	"/>
+	<circle fill="#EDDDC2" cx="61.4" cy="78.7" r="12.1"/>
+	<circle fill="#1F0924" cx="61.4" cy="78.7" r="9.5"/>
+	<circle fill="#EDDDC2" cx="58.2" cy="75.5" r="4.2"/>
+	<circle fill="#EDDDC2" cx="108.6" cy="78.7" r="12.1"/>
+	<circle fill="#1F0924" cx="108.6" cy="78.7" r="9.5"/>
+	<circle fill="#EDDDC2" cx="105.3" cy="75.5" r="4.2"/>
+	<path fill="#EDDDC2" d="M62.9,97.6c0-12.2,9.9-22.1,22.1-22.1s22.1,9.9,22.1,22.1S62.9,109.8,62.9,97.6z"/>
+	<path fill="#1F0924" d="M89.8,96.5c-2,0-3.7-1-4.8-2.5c-1,1.5-2.8,2.5-4.8,2.5c-3.2,0-5.8-2.6-5.8-5.8c0-0.6,0.4-1,1-1s1,0.4,1,1
+		c0,2.1,1.7,3.8,3.8,3.8s3.8-1.7,3.8-3.8h2c0,2.1,1.7,3.8,3.8,3.8s3.8-1.7,3.8-3.8c0-0.6,0.4-1,1-1s1,0.4,1,1
+		C95.5,93.9,93,96.5,89.8,96.5z"/>
+	<path fill="#1F0924" d="M92.8,83.6c0,4.3-3.5,7.8-7.8,7.8s-7.8-3.5-7.8-7.8C77.2,79.3,92.8,79.3,92.8,83.6z"/>
+	<path fill="#EDDDC2" d="M47,101.3c0-4,3.2-7.3,7.3-7.3s7.3,3.2,7.3,7.3S47,105.3,47,101.3z"/>
+	<path fill="#EDDDC2" d="M108.4,101.3c0-4,3.2-7.3,7.3-7.3c4,0,7.3,3.2,7.3,7.3S108.4,105.3,108.4,101.3z"/>
+</g>
+</svg>

data/spec/lib/percy/capybara/client/test_data/index.html

@@ -0,0 +1 @@
+<html><head></head><body>Hello World!</body></html>

data/spec/lib/percy/capybara/client/test_data/public/percy-from-public.svg

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 170 110" enable-background="new 0 0 170 110" xml:space="preserve">
+<g>
+	<g>
+		<polyline fill="#1F0924" points="49.2,97.6 9.4,103.4 46,86.8 6.2,81.2 46,75.6 9.4,59 49.2,64.9 18.7,38.6 55.2,55.4 33.4,21.7 
+			63.7,48.1 52.2,9.6 73.9,43.4 73.7,3.2 85,41.8 96.2,3.2 96.1,43.4 117.7,9.5 106.3,48.1 136.5,21.6 114.7,55.4 151.2,38.6 
+			120.8,64.8 160.6,59 124,75.6 163.8,81.1 124,86.8 160.6,103.3 120.8,97.5 		"/>
+		<polyline fill="#EDDDC2" points="52.8,90.2 18.5,90.3 51.4,80.7 18.5,71.2 52.8,71.3 23.9,52.8 56.8,62.6 63,55.4 48.7,24.2 
+			71.1,50.2 66.1,16.3 80.2,47.5 85,13.5 89.8,47.5 103.9,16.3 98.9,50.2 121.3,24.2 107,55.4 113.2,62.6 146.1,52.8 117.2,71.3 
+			151.5,71.2 118.6,80.7 151.5,90.3 117.2,90.2 		"/>
+	</g>
+	<polygon fill="#EDDDC2" points="108.3,45.7 134.4,39.1 127.9,65.2 	"/>
+	<polygon fill="#1F0924" points="114.2,48.6 128.5,45 124.9,59.3 114.2,59.3 	"/>
+	<polygon fill="#EDDDC2" points="61.7,45.7 35.6,39.1 42.1,65.2 	"/>
+	<polygon fill="#1F0924" points="55.8,48.6 41.5,45 45.1,59.3 55.8,59.3 	"/>
+	<polyline fill="#B157B5" points="38.3,101.1 131.7,101.1 166.8,88.5 131.5,76 155.8,47.6 119,54.5 125.9,17.7 97.5,42 85,6.7 
+		72.5,42 44.1,17.7 51,54.5 14.2,47.6 38.5,76 3.2,88.5 	"/>
+	<circle fill="#EDDDC2" cx="61.4" cy="78.7" r="12.1"/>
+	<circle fill="#1F0924" cx="61.4" cy="78.7" r="9.5"/>
+	<circle fill="#EDDDC2" cx="58.2" cy="75.5" r="4.2"/>
+	<circle fill="#EDDDC2" cx="108.6" cy="78.7" r="12.1"/>
+	<circle fill="#1F0924" cx="108.6" cy="78.7" r="9.5"/>
+	<circle fill="#EDDDC2" cx="105.3" cy="75.5" r="4.2"/>
+	<path fill="#EDDDC2" d="M62.9,97.6c0-12.2,9.9-22.1,22.1-22.1s22.1,9.9,22.1,22.1S62.9,109.8,62.9,97.6z"/>
+	<path fill="#1F0924" d="M89.8,96.5c-2,0-3.7-1-4.8-2.5c-1,1.5-2.8,2.5-4.8,2.5c-3.2,0-5.8-2.6-5.8-5.8c0-0.6,0.4-1,1-1s1,0.4,1,1
+		c0,2.1,1.7,3.8,3.8,3.8s3.8-1.7,3.8-3.8h2c0,2.1,1.7,3.8,3.8,3.8s3.8-1.7,3.8-3.8c0-0.6,0.4-1,1-1s1,0.4,1,1
+		C95.5,93.9,93,96.5,89.8,96.5z"/>
+	<path fill="#1F0924" d="M92.8,83.6c0,4.3-3.5,7.8-7.8,7.8s-7.8-3.5-7.8-7.8C77.2,79.3,92.8,79.3,92.8,83.6z"/>
+	<path fill="#EDDDC2" d="M47,101.3c0-4,3.2-7.3,7.3-7.3s7.3,3.2,7.3,7.3S47,105.3,47,101.3z"/>
+	<path fill="#EDDDC2" d="M108.4,101.3c0-4,3.2-7.3,7.3-7.3c4,0,7.3,3.2,7.3,7.3S108.4,105.3,108.4,101.3z"/>
+</g>
+</svg>

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

@@ -1,4 +1,4 @@
-IFRAME_PATH = File.expand_path('../../client/testdata/test-iframe.html', __FILE__)
+IFRAME_PATH = File.expand_path('../../client/test_data/test-iframe.html', __FILE__)
 
 class RackAppWithIframe
   def self.call(_env)
@@ -103,4 +103,10 @@ RSpec.describe Percy::Capybara::Loaders::BaseLoader do
       end
     end
   end
+
+  describe '#_uri_join' do
+    it 'joins files into a uri' do
+      expect(described_class.new.send(:_uri_join, 'foo/', '/bar', 'baz')).to eq('foo/bar/baz')
+    end
+  end
 end

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

@@ -0,0 +1,82 @@
+RSpec.describe Percy::Capybara::Loaders::EmberCliRailsLoader do
+  let(:assets_dir) { File.expand_path('../../client/ember_test_data', __FILE__) }
+  let(:mounted_apps) { {frontend: ''} }
+  let(:digest_enabled) { false }
+
+  let(:environment) do
+    environment = Sprockets::Environment.new(assets_dir)
+    environment.append_path '.'
+    environment
+  end
+
+  let(:loader) do
+    described_class.new(
+      mounted_apps,
+      sprockets_environment: environment,
+      sprockets_options: sprockets_options,
+    )
+  end
+
+  let(:sprockets_options) do
+    options = instance_double('options')
+    # Set specific files we want to compile. In normal use, this would be all asset files.
+    # For this test we just use .svg files
+    precompile_list = [%r{(?:/|\\|\A)\.svg}]
+    allow(options).to receive(:precompile).and_return(precompile_list)
+    allow(options).to receive(:digest).and_return(digest_enabled)
+    options
+  end
+
+  describe 'initialize' do
+    context 'all args supplied' do
+      it 'successfully initializes' do
+        expect { loader }.not_to raise_error
+      end
+    end
+
+    context 'mounted_apps not specified' do
+      let(:mounted_apps) { nil }
+
+      it 'raises an error' do
+        expect { loader }.to raise_error(StandardError)
+      end
+    end
+  end
+
+  describe '#build_resources' do
+    shared_examples 'a mounted ember app' do |mounted_apps|
+      ember_app  = mounted_apps.keys.first
+      mount_path = mounted_apps.values.first
+
+      let(:ember_app) { ember_app }
+      let(:mount_path) { mounted_apps.values.first }
+      let(:dist_dir) { File.join(assets_dir, 'ember-cli', ember_app.to_s) }
+      let(:loader) do
+        described_class.new(mounted_apps, sprockets_environment: environment,
+                                          sprockets_options: sprockets_options,)
+      end
+
+      context "called '#{ember_app}' and mounted at '#{mount_path}'" do
+        before do
+          allow(loader).to receive(:_dist_path_for_app).and_return(dist_dir)
+        end
+
+        it 'builds the expected resources' do
+          expected_urls = loader.build_resources.collect(&:resource_url)
+          expected_url = loader._uri_join(
+            mount_path,
+            described_class::EMBER_ASSETS_DIR,
+            "percy-#{ember_app}.svg",
+          )
+
+          expect(expected_urls).to include(expected_url)
+        end
+      end
+    end
+
+    it_behaves_like 'a mounted ember app', frontend: '/'
+    it_behaves_like 'a mounted ember app', frontend: ''
+    it_behaves_like 'a mounted ember app', admin: '/admin'
+    it_behaves_like 'a mounted ember app', admin: '/admin/'
+  end
+end

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

@@ -1,6 +1,6 @@
 RSpec.describe Percy::Capybara::Loaders::FilesystemLoader do
   let(:fake_page) { OpenStruct.new(current_url: 'http://localhost/foo') }
-  let(:assets_dir) { File.expand_path('../../client/testdata', __FILE__) }
+  let(:assets_dir) { File.expand_path('../../client/test_data', __FILE__) }
   let(:base_url) { '/url-prefix/' }
   let(:loader) { described_class.new(base_url: base_url, assets_dir: assets_dir, page: fake_page) }
 
@@ -13,14 +13,14 @@ RSpec.describe Percy::Capybara::Loaders::FilesystemLoader do
       end
     end
     context 'assets_dir is not an absolute path' do
-      let(:assets_dir) { '../../client/testdata' }
+      let(:assets_dir) { '../../client/test_data' }
 
       it 'raises an error' do
         expect { loader }.to raise_error(ArgumentError)
       end
     end
-    context 'assets_dir doesn\'t exist' do
-      let(:assets_dir) { File.expand_path('../../client/testdata-doesnt-exist', __FILE__) }
+    context "assets_dir doesn't exist" do
+      let(:assets_dir) { File.expand_path('../../client/test-data-doesnt-exist', __FILE__) }
 
       it 'raises an error' do
         expect { loader }.to raise_error(ArgumentError)
@@ -132,7 +132,7 @@ RSpec.describe Percy::Capybara::Loaders::FilesystemLoader do
       end
     end
     context 'assets_dir with only skippable resources' do
-      let(:assets_dir) { File.expand_path('../../client/testdata/assets/images', __FILE__) }
+      let(:assets_dir) { File.expand_path('../../client/test_data/assets/images', __FILE__) }
 
       it 'returns an empty list' do
         expect(loader.build_resources).to eq([])

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

@@ -205,7 +205,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       # The order of these is just for convenience, they match the order in test-images.html.
 
       resource = find_resource(resources, '/images/img-relative.png')
-      path = File.expand_path('../../client/testdata/images/img-relative.png', __FILE__)
+      path = File.expand_path('../../client/test_data/images/img-relative.png', __FILE__)
       content = File.read(path)
       expect(resource.mimetype).to eq('image/png')
       expected_sha = Digest::SHA256.hexdigest(content)
@@ -213,7 +213,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       expect(resource.sha).to eq(expected_sha)
 
       resource = find_resource(resources, '/images/img-relative-to-root.png')
-      path = File.expand_path('../../client/testdata/images/img-relative-to-root.png', __FILE__)
+      path = File.expand_path('../../client/test_data/images/img-relative-to-root.png', __FILE__)
       content = File.read(path)
       expect(resource.mimetype).to eq('image/png')
       expected_sha = Digest::SHA256.hexdigest(content)
@@ -221,7 +221,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       expect(resource.sha).to eq(expected_sha)
 
       resource = find_resource(resources, '/images/percy.svg')
-      path = File.expand_path('../../client/testdata/images/percy.svg', __FILE__)
+      path = File.expand_path('../../client/test_data/images/percy.svg', __FILE__)
       content = File.read(path)
       # In Ruby 1.9.3 the SVG mimetype is not registered so our mini ruby webserver doesn't serve
       # the correct content type. Allow either to work here so we can test older Rubies fully.
@@ -231,7 +231,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       expect(resource.sha).to eq(expected_sha)
 
       resource = find_resource(resources, '/images/bg-relative.png')
-      path = File.expand_path('../../client/testdata/images/bg-relative.png', __FILE__)
+      path = File.expand_path('../../client/test_data/images/bg-relative.png', __FILE__)
       content = File.read(path)
       expect(resource.mimetype).to eq('image/png')
       expected_sha = Digest::SHA256.hexdigest(content)
@@ -239,7 +239,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       expect(resource.sha).to eq(expected_sha)
 
       resource = find_resource(resources, '/images/bg-relative-to-root.png')
-      path = File.expand_path('../../client/testdata/images/bg-relative-to-root.png', __FILE__)
+      path = File.expand_path('../../client/test_data/images/bg-relative-to-root.png', __FILE__)
       content = File.read(path)
       expect(resource.mimetype).to eq('image/png')
       expected_sha = Digest::SHA256.hexdigest(content)
@@ -247,7 +247,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       expect(resource.sha).to eq(expected_sha)
 
       resource = find_resource(resources, '/images/bg-stacked.png')
-      path = File.expand_path('../../client/testdata/images/bg-stacked.png', __FILE__)
+      path = File.expand_path('../../client/test_data/images/bg-stacked.png', __FILE__)
       content = File.read(path)
       expect(resource.mimetype).to eq('image/png')
       expected_sha = Digest::SHA256.hexdigest(content)
@@ -255,7 +255,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       expect(resource.sha).to eq(expected_sha)
 
       resource = find_resource(resources, '/images/srcset-base.png')
-      path = File.expand_path('../../client/testdata/images/srcset-base.png', __FILE__)
+      path = File.expand_path('../../client/test_data/images/srcset-base.png', __FILE__)
       content = File.read(path)
       expect(resource.mimetype).to eq('image/png')
       expected_sha = Digest::SHA256.hexdigest(content)
@@ -263,7 +263,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       expect(resource.sha).to eq(expected_sha)
 
       resource = find_resource(resources, '/images/srcset-first.png')
-      path = File.expand_path('../../client/testdata/images/srcset-first.png', __FILE__)
+      path = File.expand_path('../../client/test_data/images/srcset-first.png', __FILE__)
       content = File.read(path)
       expect(resource.mimetype).to eq('image/png')
       expected_sha = Digest::SHA256.hexdigest(content)
@@ -271,7 +271,7 @@ RSpec.describe Percy::Capybara::Loaders::NativeLoader do
       expect(resource.sha).to eq(expected_sha)
 
       resource = find_resource(resources, '/images/srcset-second.png')
-      path = File.expand_path('../../client/testdata/images/srcset-second.png', __FILE__)
+      path = File.expand_path('../../client/test_data/images/srcset-second.png', __FILE__)
       content = File.read(path)
       expect(resource.mimetype).to eq('image/png')
       expected_sha = Digest::SHA256.hexdigest(content)

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

@@ -15,7 +15,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
     )
   end
   let(:environment) do
-    root = File.expand_path('../../client/testdata', __FILE__)
+    root = File.expand_path('../../client/test_data', __FILE__)
     environment = Sprockets::Environment.new(root)
     environment.append_path '.'
     environment
@@ -76,7 +76,7 @@ RSpec.describe Percy::Capybara::Loaders::SprocketsLoader do
       before do
         # Pretend like we're in a Rails app right now, all we care about is Rails.public_path.
         rails_double = double('Rails')
-        # Pretend like the entire testdata directory is the public/ folder.
+        # Pretend like the entire test_data directory is the public/ folder.
         expect(rails_double).to receive(:application).and_return(nil)
         expect(rails_double).to receive(:public_path).and_return(environment.root + '/public')
         expect(loader).to receive(:_rails).at_least(:once).and_return(rails_double)

data/spec/spec_helper.rb

@@ -51,9 +51,9 @@ RSpec.configure do |config|
   # Cover all debug messages by outputting them in this gem's tests.
   Percy.config.debug = true
 
-  # Start a temp webserver that serves the testdata directory.
+  # Start a temp webserver that serves the test_data directory.
   # You can test this server manually by running:
-  # ruby -run -e httpd spec/lib/percy/capybara/client/testdata/ -p 9090
+  # ruby -run -e httpd spec/lib/percy/capybara/client/test_data/ -p 9090
   config.before(:all, type: :feature) do
     port = random_open_port
     Capybara.app = nil
@@ -61,7 +61,7 @@ RSpec.configure do |config|
     Capybara.run_server = false
 
     # Note: using this form of popen to keep stdout and stderr silent and captured.
-    dir = File.expand_path('../lib/percy/capybara/client/testdata/', __FILE__)
+    dir = File.expand_path('../lib/percy/capybara/client/test_data/', __FILE__)
     @process = IO.popen(
       [
         'ruby', '-run', '-e', 'httpd', dir, '-p', port.to_s, err: [:child, :out],

data/spec/support/test_helpers.rb

@@ -35,7 +35,7 @@ module TestHelpers
   end
 
   def setup_sprockets(capybara_client)
-    root = File.expand_path('../../lib/percy/capybara/client/testdata', __FILE__)
+    root = File.expand_path('../../lib/percy/capybara/client/test_data', __FILE__)
     environment = Sprockets::Environment.new(root)
     environment.append_path '.'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-capybara
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: percy-client
@@ -196,6 +196,7 @@ files:
 - lib/percy/capybara/client/snapshots.rb
 - lib/percy/capybara/httpfetcher.rb
 - lib/percy/capybara/loaders/base_loader.rb
+- lib/percy/capybara/loaders/ember_cli_rails_loader.rb
 - lib/percy/capybara/loaders/filesystem_loader.rb
 - lib/percy/capybara/loaders/native_loader.rb
 - lib/percy/capybara/loaders/sprockets_loader.rb
@@ -203,40 +204,45 @@ files:
 - lib/percy/capybara/version.rb
 - percy-capybara.gemspec
 - spec/lib/percy/capybara/client/builds_spec.rb
+- spec/lib/percy/capybara/client/ember_test_data/ember-cli/admin/assets/percy-admin.svg
+- spec/lib/percy/capybara/client/ember_test_data/ember-cli/admin/index.html
+- spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/assets/percy-frontend.svg
+- spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/index.html
 - spec/lib/percy/capybara/client/snapshots_spec.rb
-- spec/lib/percy/capybara/client/testdata/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css
-- spec/lib/percy/capybara/client/testdata/assets/images/large-file-skipped.png
-- spec/lib/percy/capybara/client/testdata/css/base.css
-- spec/lib/percy/capybara/client/testdata/css/digested.css
-- spec/lib/percy/capybara/client/testdata/css/font.css
-- spec/lib/percy/capybara/client/testdata/css/imports.css
-- spec/lib/percy/capybara/client/testdata/css/level0-imports.css
-- spec/lib/percy/capybara/client/testdata/css/level1-imports.css
-- spec/lib/percy/capybara/client/testdata/css/level2-imports.css
-- spec/lib/percy/capybara/client/testdata/css/simple-imports.css
-- spec/lib/percy/capybara/client/testdata/css/source.css.map
-- spec/lib/percy/capybara/client/testdata/iframe.html
-- spec/lib/percy/capybara/client/testdata/images/bg-relative-to-root.png
-- spec/lib/percy/capybara/client/testdata/images/bg-relative.png
-- spec/lib/percy/capybara/client/testdata/images/bg-stacked.png
-- spec/lib/percy/capybara/client/testdata/images/img-relative-to-root.png
-- spec/lib/percy/capybara/client/testdata/images/img-relative.png
-- spec/lib/percy/capybara/client/testdata/images/percy.svg
-- spec/lib/percy/capybara/client/testdata/images/srcset-base.png
-- spec/lib/percy/capybara/client/testdata/images/srcset-first.png
-- spec/lib/percy/capybara/client/testdata/images/srcset-second.png
-- spec/lib/percy/capybara/client/testdata/index.html
-- spec/lib/percy/capybara/client/testdata/js/base.js
-- spec/lib/percy/capybara/client/testdata/public/large-file-skipped.png
-- spec/lib/percy/capybara/client/testdata/public/percy-from-public.svg
-- spec/lib/percy/capybara/client/testdata/test-css.html
-- spec/lib/percy/capybara/client/testdata/test-font.html
-- spec/lib/percy/capybara/client/testdata/test-iframe.html
-- spec/lib/percy/capybara/client/testdata/test-images.html
-- spec/lib/percy/capybara/client/testdata/test-localtest-me-images.html
+- spec/lib/percy/capybara/client/test_data/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css
+- spec/lib/percy/capybara/client/test_data/assets/images/large-file-skipped.png
+- spec/lib/percy/capybara/client/test_data/css/base.css
+- spec/lib/percy/capybara/client/test_data/css/digested.css
+- spec/lib/percy/capybara/client/test_data/css/font.css
+- spec/lib/percy/capybara/client/test_data/css/imports.css
+- spec/lib/percy/capybara/client/test_data/css/level0-imports.css
+- spec/lib/percy/capybara/client/test_data/css/level1-imports.css
+- spec/lib/percy/capybara/client/test_data/css/level2-imports.css
+- spec/lib/percy/capybara/client/test_data/css/simple-imports.css
+- spec/lib/percy/capybara/client/test_data/css/source.css.map
+- spec/lib/percy/capybara/client/test_data/iframe.html
+- spec/lib/percy/capybara/client/test_data/images/bg-relative-to-root.png
+- spec/lib/percy/capybara/client/test_data/images/bg-relative.png
+- spec/lib/percy/capybara/client/test_data/images/bg-stacked.png
+- spec/lib/percy/capybara/client/test_data/images/img-relative-to-root.png
+- spec/lib/percy/capybara/client/test_data/images/img-relative.png
+- spec/lib/percy/capybara/client/test_data/images/percy.svg
+- spec/lib/percy/capybara/client/test_data/images/srcset-base.png
+- spec/lib/percy/capybara/client/test_data/images/srcset-first.png
+- spec/lib/percy/capybara/client/test_data/images/srcset-second.png
+- spec/lib/percy/capybara/client/test_data/index.html
+- spec/lib/percy/capybara/client/test_data/js/base.js
+- spec/lib/percy/capybara/client/test_data/public/large-file-skipped.png
+- spec/lib/percy/capybara/client/test_data/public/percy-from-public.svg
+- spec/lib/percy/capybara/client/test_data/test-css.html
+- spec/lib/percy/capybara/client/test_data/test-font.html
+- spec/lib/percy/capybara/client/test_data/test-iframe.html
+- spec/lib/percy/capybara/client/test_data/test-images.html
+- spec/lib/percy/capybara/client/test_data/test-localtest-me-images.html
 - spec/lib/percy/capybara/client_spec.rb
 - spec/lib/percy/capybara/http_fetcher_spec.rb
 - spec/lib/percy/capybara/loaders/base_loader_spec.rb
+- spec/lib/percy/capybara/loaders/ember_cli_rails_loader_spec.rb
 - spec/lib/percy/capybara/loaders/filesystem_loader_spec.rb
 - spec/lib/percy/capybara/loaders/native_loader_spec.rb
 - spec/lib/percy/capybara/loaders/sprockets_loader_spec.rb
@@ -269,40 +275,45 @@ specification_version: 4
 summary: Percy::Capybara
 test_files:
 - spec/lib/percy/capybara/client/builds_spec.rb
+- spec/lib/percy/capybara/client/ember_test_data/ember-cli/admin/assets/percy-admin.svg
+- spec/lib/percy/capybara/client/ember_test_data/ember-cli/admin/index.html
+- spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/assets/percy-frontend.svg
+- spec/lib/percy/capybara/client/ember_test_data/ember-cli/frontend/index.html
 - spec/lib/percy/capybara/client/snapshots_spec.rb
-- spec/lib/percy/capybara/client/testdata/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css
-- spec/lib/percy/capybara/client/testdata/assets/images/large-file-skipped.png
-- spec/lib/percy/capybara/client/testdata/css/base.css
-- spec/lib/percy/capybara/client/testdata/css/digested.css
-- spec/lib/percy/capybara/client/testdata/css/font.css
-- spec/lib/percy/capybara/client/testdata/css/imports.css
-- spec/lib/percy/capybara/client/testdata/css/level0-imports.css
-- spec/lib/percy/capybara/client/testdata/css/level1-imports.css
-- spec/lib/percy/capybara/client/testdata/css/level2-imports.css
-- spec/lib/percy/capybara/client/testdata/css/simple-imports.css
-- spec/lib/percy/capybara/client/testdata/css/source.css.map
-- spec/lib/percy/capybara/client/testdata/iframe.html
-- spec/lib/percy/capybara/client/testdata/images/bg-relative-to-root.png
-- spec/lib/percy/capybara/client/testdata/images/bg-relative.png
-- spec/lib/percy/capybara/client/testdata/images/bg-stacked.png
-- spec/lib/percy/capybara/client/testdata/images/img-relative-to-root.png
-- spec/lib/percy/capybara/client/testdata/images/img-relative.png
-- spec/lib/percy/capybara/client/testdata/images/percy.svg
-- spec/lib/percy/capybara/client/testdata/images/srcset-base.png
-- spec/lib/percy/capybara/client/testdata/images/srcset-first.png
-- spec/lib/percy/capybara/client/testdata/images/srcset-second.png
-- spec/lib/percy/capybara/client/testdata/index.html
-- spec/lib/percy/capybara/client/testdata/js/base.js
-- spec/lib/percy/capybara/client/testdata/public/large-file-skipped.png
-- spec/lib/percy/capybara/client/testdata/public/percy-from-public.svg
-- spec/lib/percy/capybara/client/testdata/test-css.html
-- spec/lib/percy/capybara/client/testdata/test-font.html
-- spec/lib/percy/capybara/client/testdata/test-iframe.html
-- spec/lib/percy/capybara/client/testdata/test-images.html
-- spec/lib/percy/capybara/client/testdata/test-localtest-me-images.html
+- spec/lib/percy/capybara/client/test_data/assets/css/digested-f3420c6aee71c137a3ca39727052811bae84b2f37d898f4db242e20656a1579e.css
+- spec/lib/percy/capybara/client/test_data/assets/images/large-file-skipped.png
+- spec/lib/percy/capybara/client/test_data/css/base.css
+- spec/lib/percy/capybara/client/test_data/css/digested.css
+- spec/lib/percy/capybara/client/test_data/css/font.css
+- spec/lib/percy/capybara/client/test_data/css/imports.css
+- spec/lib/percy/capybara/client/test_data/css/level0-imports.css
+- spec/lib/percy/capybara/client/test_data/css/level1-imports.css
+- spec/lib/percy/capybara/client/test_data/css/level2-imports.css
+- spec/lib/percy/capybara/client/test_data/css/simple-imports.css
+- spec/lib/percy/capybara/client/test_data/css/source.css.map
+- spec/lib/percy/capybara/client/test_data/iframe.html
+- spec/lib/percy/capybara/client/test_data/images/bg-relative-to-root.png
+- spec/lib/percy/capybara/client/test_data/images/bg-relative.png
+- spec/lib/percy/capybara/client/test_data/images/bg-stacked.png
+- spec/lib/percy/capybara/client/test_data/images/img-relative-to-root.png
+- spec/lib/percy/capybara/client/test_data/images/img-relative.png
+- spec/lib/percy/capybara/client/test_data/images/percy.svg
+- spec/lib/percy/capybara/client/test_data/images/srcset-base.png
+- spec/lib/percy/capybara/client/test_data/images/srcset-first.png
+- spec/lib/percy/capybara/client/test_data/images/srcset-second.png
+- spec/lib/percy/capybara/client/test_data/index.html
+- spec/lib/percy/capybara/client/test_data/js/base.js
+- spec/lib/percy/capybara/client/test_data/public/large-file-skipped.png
+- spec/lib/percy/capybara/client/test_data/public/percy-from-public.svg
+- spec/lib/percy/capybara/client/test_data/test-css.html
+- spec/lib/percy/capybara/client/test_data/test-font.html
+- spec/lib/percy/capybara/client/test_data/test-iframe.html
+- spec/lib/percy/capybara/client/test_data/test-images.html
+- spec/lib/percy/capybara/client/test_data/test-localtest-me-images.html
 - spec/lib/percy/capybara/client_spec.rb
 - spec/lib/percy/capybara/http_fetcher_spec.rb
 - spec/lib/percy/capybara/loaders/base_loader_spec.rb
+- spec/lib/percy/capybara/loaders/ember_cli_rails_loader_spec.rb
 - spec/lib/percy/capybara/loaders/filesystem_loader_spec.rb
 - spec/lib/percy/capybara/loaders/native_loader_spec.rb
 - spec/lib/percy/capybara/loaders/sprockets_loader_spec.rb