kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'rs-phantomjs-disable-images' into 'master' 

Pass `--load-images=no` to PhantomJS via Capybara/Poltergeist

We were unintentionally hitting `gravatar.com` whenever a test that used
Poltergeist was run. This was certainly wasting their resources and
slowing down our tests even further, for no reason.

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899

See merge request !7781
This commit is contained in:
Rémy Coutable 2016-11-28 11:37:21 +00:00
parent 6ea0b8d563 1e66f35c56
commit 13c0039891
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
features/support/capybara.rb
View File

@ -6,7 +6,15 @@ timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 15
Capybara.javascript_driver = :poltergeist
Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768])
Capybara::Poltergeist::Driver.new(
app,
js_errors: true,
timeout: timeout,
window_size: [1366, 768],
phantomjs_options: [
'--load-images=no'
]
)
end
Capybara.default_max_wait_time = timeout

10
spec/support/capybara.rb
View File

@ -7,7 +7,15 @@ timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 10
Capybara.javascript_driver = :poltergeist
Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768])
Capybara::Poltergeist::Driver.new(
app,
js_errors: true,
timeout: timeout,
window_size: [1366, 768],
phantomjs_options: [
'--load-images=no'
]
)
end
Capybara.default_max_wait_time = timeout