diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-04 07:53:19 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-04 07:53:19 +0000 |
| commit | b57ed57f6b0100b2f8c5b062bac10628ce3bbacd (patch) | |
| tree | 85c0c36a78930788e9773aba30a9b36cde39612f /features | |
| parent | fa65b65b0f5e7095e2ec7c4ca0c269a4fe4baab1 (diff) | |
| parent | e97d1ae036c6a686c32c7b0e5f6919f3d0566e96 (diff) | |
| download | gitlab-ce-b57ed57f6b0100b2f8c5b062bac10628ce3bbacd.tar.gz | |
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
Diffstat (limited to 'features')
| -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 |