diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-14 18:43:53 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-14 18:43:53 +0300 |
| commit | b8a54fc002aea16bf5024c8749007a0b6f8f7141 (patch) | |
| tree | e16502ad6fa2409971315fb6e40bdecdf8961852 /spec/support | |
| parent | bdc1a55eded1f60900fe89591a7fb935445eaac6 (diff) | |
| parent | a61c19778180a8316321ac9ca6f84de76a6c23b3 (diff) | |
Merge branch 'rs-capybara-screenshot-artifacts' into 'master'
Store capybara screenshots as build artifacts
Closes #13971
See merge request !7985
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/capybara.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 62740ec29fd..aa14709bc9c 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -1,6 +1,7 @@ require 'capybara/rails' require 'capybara/rspec' require 'capybara/poltergeist' +require 'capybara-screenshot/rspec' # Give CI some extra time timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 30 : 10 @@ -21,12 +22,8 @@ end Capybara.default_max_wait_time = timeout Capybara.ignore_hidden_elements = true -unless ENV['CI'] || ENV['CI_SERVER'] - require 'capybara-screenshot/rspec' - - # Keep only the screenshots generated from the last failing test suite - Capybara::Screenshot.prune_strategy = :keep_last_run -end +# Keep only the screenshots generated from the last failing test suite +Capybara::Screenshot.prune_strategy = :keep_last_run RSpec.configure do |config| config.before(:suite) do |