diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-12 19:51:30 +0000 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-15 11:12:57 -0500 |
| commit | 3ae25c5caaa67836600144b5f210ab2d53f866b8 (patch) | |
| tree | 5454cd13bb24f31d84fe11c1bc8f953332c24867 /features | |
| parent | daff635d75eb47cbe0c801e04e0a79e65f11f446 (diff) | |
| download | gitlab-ce-3ae25c5caaa67836600144b5f210ab2d53f866b8.tar.gz | |
Merge branch 'rc/load-images-in-phantomjs' into 'master'
Let PhantomJS load local images
See merge request !12003
Diffstat (limited to 'features')
| -rw-r--r-- | features/support/capybara.rb | 4 |
1 files changed, 3 insertions, 1 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 |