Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-12-08 06:45:34 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-12-08 08:46:25 +0300
commita61c19778180a8316321ac9ca6f84de76a6c23b3 (patch)
tree5ca2f66f3ce3e82dbaddd02cba45928c20f38f2e /features/support
parentb2592f01da50367f1c6a2acf4ef701d3a7661d36 (diff)
Don't disable capybara-screenshot in CI environment
Diffstat (limited to 'features/support')
-rw-r--r--features/support/capybara.rb9
1 files changed, 3 insertions, 6 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']