Merge branch 'rc/load-images-in-phantomjs' into 'master'

Let PhantomJS load local images

See merge request !12003

4 files changed, 12 insertions, 13 deletions

diff --git a/features/support/capybara.rb b/features/support/capybara.rb
index 6da8aaac6cb..f4691647d4b 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -11,8 +11,10 @@ Capybara.register_driver :poltergeist do |app|
     js_errors: true,
     timeout: timeout,
     window_size: [1366, 768],
+    url_whitelist: %w[localhost 127.0.0.1],
+    url_blacklist: %w[.mp4 .png .gif .avi .bmp .jpg .jpeg],
     phantomjs_options: [
-      '--load-images=no'
+      '--load-images=yes'
     ]
   )
 end
diff --git a/spec/features/help_pages_spec.rb b/spec/features/help_pages_spec.rb
index e0b2404e60a..31014f5cad2 100644
--- a/spec/features/help_pages_spec.rb
+++ b/spec/features/help_pages_spec.rb
@@ -34,7 +34,7 @@ describe 'Help Pages', feature: true do
     end
   end
 
-  context 'in a production environment with version check enabled', js: true do
+  context 'in a production environment with version check enabled', :js do
     before do
       allow(Rails.env).to receive(:production?) { true }
       allow(current_application_settings).to receive(:version_check_enabled) { true }
@@ -44,18 +44,12 @@ describe 'Help Pages', feature: true do
       visit help_path
     end
 
-    it 'should display a version check image' do
-      expect(find('.js-version-status-badge')).to be_visible
+    it 'has a version check image' do
+      expect(find('.js-version-status-badge', visible: false)['src']).to end_with('/version-check-url')
     end
 
-    it 'should have a src url' do
-      expect(find('.js-version-status-badge')['src']).to match(/\/version-check-url/)
-    end
-
-    it 'should hide the version check image if the image request fails' do
-      # We use '--load-images=no' with poltergeist so we must trigger manually
-      execute_script("$('.js-version-status-badge').trigger('error');")
-
+    it 'hides the version check image if the image request fails' do
+      # We use '--load-images=yes' with poltergeist so the image fails to load
       expect(find('.js-version-status-badge', visible: false)).not_to be_visible
     end
   end
diff --git a/spec/features/projects/artifacts/file_spec.rb b/spec/features/projects/artifacts/file_spec.rb
index 25c4f3c87a2..860373e531b 100644
--- a/spec/features/projects/artifacts/file_spec.rb
+++ b/spec/features/projects/artifacts/file_spec.rb
@@ -39,6 +39,7 @@ feature 'Artifact file', :js, feature: true do
 
   context 'JPG file' do
     before do
+      page.driver.browser.url_blacklist = []
       visit_file('rails_sample.jpg')
 
       wait_for_requests
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index b8ca8f22a3d..c34e76fa72f 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -14,8 +14,10 @@ Capybara.register_driver :poltergeist do |app|
     js_errors: true,
     timeout: timeout,
     window_size: [1366, 768],
+    url_whitelist: %w[localhost 127.0.0.1],
+    url_blacklist: %w[.mp4 .png .gif .avi .bmp .jpg .jpeg],
     phantomjs_options: [
-      '--load-images=no'
+      '--load-images=yes'
     ]
   )
 end