Commit b57ed57f authored by Robert Speicher's avatar Robert Speicher

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
parents fa65b65b e97d1ae0
...@@ -24,8 +24,5 @@ Capybara.ignore_hidden_elements = false ...@@ -24,8 +24,5 @@ Capybara.ignore_hidden_elements = false
Capybara::Screenshot.prune_strategy = :keep_last_run Capybara::Screenshot.prune_strategy = :keep_last_run
Spinach.hooks.before_run do Spinach.hooks.before_run do
require 'spinach/capybara'
require 'capybara/rails'
TestEnv.eager_load_driver_server TestEnv.eager_load_driver_server
end end
...@@ -5,10 +5,6 @@ ENV['RAILS_ENV'] = 'test' ...@@ -5,10 +5,6 @@ ENV['RAILS_ENV'] = 'test'
require './config/environment' require './config/environment'
require 'rspec/expectations' require 'rspec/expectations'
require_relative 'capybara'
require_relative 'db_cleaner'
require_relative 'rerun'
if ENV['CI'] if ENV['CI']
require 'knapsack' require 'knapsack'
Knapsack::Adapters::SpinachAdapter.bind Knapsack::Adapters::SpinachAdapter.bind
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment