summaryrefslogtreecommitdiff
path: root/features/support
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-08 11:43:13 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-08 11:43:13 +0200
commiteb95019178a002e0c016e60c7b8ef3eb49f7997e (patch)
treedd5300bb0d3a6a76e7b3960a82c38cc29f3601db /features/support
parent915ad255cdc7afa9a44ba24eed62f28184e81836 (diff)
downloadgitlab-ce-eb95019178a002e0c016e60c7b8ef3eb49f7997e.tar.gz
Enable Knapsack only in CI environmentknapsack-env-ci
Diffstat (limited to 'features/support')
-rw-r--r--features/support/env.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index 4552db8ad77..edc08cf0986 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -11,13 +11,15 @@ ENV['RAILS_ENV'] = 'test'
require './config/environment'
require 'rspec/expectations'
require 'sidekiq/testing/inline'
-require 'knapsack'
require_relative 'capybara'
require_relative 'db_cleaner'
require_relative 'rerun'
-Knapsack::Adapters::SpinachAdapter.bind
+if ENV['CI']
+ require 'knapsack'
+ Knapsack::Adapters::RSpecAdapter.bind
+end
%w(select2_helper test_env repo_helpers).each do |f|
require Rails.root.join('spec', 'support', f)