Merge branch 'rs-capybara-screenshot-artifacts' into 'master'

Store capybara screenshots as build artifacts

Closes #13971

See merge request !7985

.gitlab-ci.yml

@@ -67,9 +67,11 @@ stages:
     - knapsack rspec "--color --format documentation"
   artifacts:
     expire_in: 31d
+    when: always
     paths:
-    - knapsack/
     - coverage/
+    - knapsack/
+    - tmp/capybara/
 
 .spinach-knapsack: &spinach-knapsack
   stage: test
@@ -85,9 +87,11 @@ stages:
     - knapsack spinach "-r rerun" || retry '[[ -e tmp/spinach-rerun.txt ]] && bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
   artifacts:
     expire_in: 31d
+    when: always
     paths:
-    - knapsack/
     - coverage/
+    - knapsack/
+    - tmp/capybara/
 
 # Prepare and merge knapsack tests
 

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']) ? 30 : 10
@@ -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']

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