Don't use capybara-screenshot in CI environments

652c15b5 · Robert Speicher · 38759307 · 652c15b5 · 652c15b5
Commit 652c15b5 authored Apr 25, 2015 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

features/support/capybara.rb features/support/capybara.rb +5 -3

spec/support/capybara.rb spec/support/capybara.rb +5 -3

No files found.
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -16,7 +16,9 @@ end
 Capybara.default_wait_time = timeout
 Capybara.ignore_hidden_elements = false

-require 'capybara-screenshot/spinach'
+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
+  # Keep only the screenshots generated from the last failing test suite
+  Capybara::Screenshot.prune_strategy = :keep_last_run
+end
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -13,7 +13,9 @@ end
 Capybara.default_wait_time = timeout
 Capybara.ignore_hidden_elements = true

-require 'capybara-screenshot/rspec'
+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
+  # Keep only the screenshots generated from the last failing test suite
+  Capybara::Screenshot.prune_strategy = :keep_last_run
+end