diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-04 00:22:52 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-04 01:57:41 +0200 |
| commit | e97d1ae036c6a686c32c7b0e5f6919f3d0566e96 (patch) | |
| tree | fdfd6aa92e816afbc510db22fd3073739a6eda29 | |
| parent | d9aca741155f456711e37ea68a28a46d349af698 (diff) | |
| download | gitlab-ce-rc/fix-spinach-plus-knapsack-properly.tar.gz | |
Fix a Knapsack issue that would load support/capybara.rb before support/env.rbrc/fix-spinach-plus-knapsack-properly
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>
| -rw-r--r-- | features/support/capybara.rb | 3 | ||||
| -rw-r--r-- | features/support/env.rb | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index 1e46b3faf0b..6da8aaac6cb 100644 --- a/features/support/capybara.rb +++ b/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 diff --git a/features/support/env.rb b/features/support/env.rb index 26cdd9d746d..06c804b1db7 100644 --- a/features/support/env.rb +++ b/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 |