summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-22 20:34:36 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 17:08:18 +0200
commit77f8deec2ccbde0e502ecf35e1484f2c2e4e8a54 (patch)
treebdd4f9c94e403a639cf199f5c84f88d20e7fb11b /features
parent8d8d2759efaba594ec010a030bed94785016e274 (diff)
downloadgitlab-ce-77f8deec2ccbde0e502ecf35e1484f2c2e4e8a54.tar.gz
Use own version of knapsack which supports spinach tests
Diffstat (limited to 'features')
-rw-r--r--features/support/env.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index 5a34159ec92..b4b3e7359b4 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -11,12 +11,14 @@ ENV['RAILS_ENV'] = 'test'
require './config/environment'
require 'rspec/expectations'
require 'sidekiq/testing/inline'
-require 'knapsack'
+require 'knapsack-gitlab'
require_relative 'capybara'
require_relative 'db_cleaner'
require_relative 'rerun'
+Knapsack::Adapters::SpinachAdapter.bind
+
%w(select2_helper test_env repo_helpers).each do |f|
require Rails.root.join('spec', 'support', f)
end