diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-05-03 12:27:16 -0300 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-05-03 12:27:16 -0300 |
| commit | 17d5b333af19ccab3685592082740ad1db0e2fb4 (patch) | |
| tree | 280d52a6b0ec4e438013c5d293a5e0eda99ae572 /spec/support/capybara.rb | |
| parent | dd91260899912956534ffffda2272053668c8f68 (diff) | |
| parent | c33c23104246b14f25d4c535e7f153a0cb389f7f (diff) | |
| download | gitlab-ce-new-docs-topic-issues.tar.gz | |
Merge branch 'new-docs-topic-issues' of gitlab.com:gitlab-org/gitlab-ce into new-docs-topic-issuesnew-docs-topic-issues
Diffstat (limited to 'spec/support/capybara.rb')
| -rw-r--r-- | spec/support/capybara.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index e1f90e17cce..16d5f2bf0b8 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -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 |