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

Once https://github.com/ArturT/knapsack/issues/57 is solved and released
in a new gem version, we can remove the KNAPSACK_TEST_DIR in
.gitlab-ci.yml.

Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2017-04-04 00:22:52 +02:00
parent d9aca74115
commit e97d1ae036
No known key found for this signature in database
GPG Key ID: 46DF07E5CD9E96AB
2 changed files with 0 additions and 7 deletions

View File

@ -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

View File

@ -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