Merge branch 'rc/fix-spinach-plus-knapsack-properly' into 'master'

Fix a Knapsack issue that would load support/capybara.rb before support/env.rb

See merge request !10430

features/support/capybara.rb

@@ -24,8 +24,5 @@ Capybara.ignore_hidden_elements = false
 Capybara::Screenshot.prune_strategy = :keep_last_run
 Spinach.hooks.before_run do
-  require 'spinach/capybara'
-  require 'capybara/rails'
-
   TestEnv.eager_load_driver_server
 end

features/support/env.rb

@@ -5,10 +5,6 @@ ENV['RAILS_ENV'] = 'test'
 require './config/environment'
 require 'rspec/expectations'
-require_relative 'capybara'
-require_relative 'db_cleaner'
-require_relative 'rerun'
-
 if ENV['CI']
   require 'knapsack'
   Knapsack::Adapters::SpinachAdapter.bind