diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-12-08 14:45:34 +1100 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-12-08 16:46:25 +1100 |
| commit | a61c19778180a8316321ac9ca6f84de76a6c23b3 (patch) | |
| tree | 5ca2f66f3ce3e82dbaddd02cba45928c20f38f2e | |
| parent | b2592f01da50367f1c6a2acf4ef701d3a7661d36 (diff) | |
| download | gitlab-ce-rs-capybara-screenshot-artifacts.tar.gz | |
Don't disable capybara-screenshot in CI environmentrs-capybara-screenshot-artifacts
| -rw-r--r-- | features/support/capybara.rb | 9 | ||||
| -rw-r--r-- | spec/support/capybara.rb | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index 47372df152d..0b6a0981a3c 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -1,5 +1,6 @@ require 'spinach/capybara' require 'capybara/poltergeist' +require 'capybara-screenshot/spinach' # Give CI some extra time timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 15 @@ -20,12 +21,8 @@ end Capybara.default_max_wait_time = timeout Capybara.ignore_hidden_elements = false -unless ENV['CI'] || ENV['CI_SERVER'] - require 'capybara-screenshot/spinach' - - # 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 Spinach.hooks.before_run do TestEnv.warm_asset_cache unless ENV['CI'] || ENV['CI_SERVER'] diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 16d5f2bf0b8..ebb1f30f090 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']) ? 90 : 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 |