summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2016-07-13 12:30:58 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2016-07-13 12:30:58 +0000
commit4be505bfd177755103d74ca4874086853a32449a (patch)
tree9af7ae9d6f11e225c320ca0f4ceaafe91434c901 /features
parent9ca633eb4c62231e4ddff5466c723cf8e2bdb25d (diff)
parentda47f20a025b27485a0b294ec92571aafe8438e5 (diff)
downloadgitlab-ce-4be505bfd177755103d74ca4874086853a32449a.tar.gz
Merge branch 'fix-knapsack-for-spinach' into 'master'
Fix Knapsack report generation for Spinach ## What does this MR do? Makes Knapsack auto-balacing work for Spinach tests ## Why was this MR needed? We used wrong Knapsack adapter, thus making spinach to run split, but not auto-balanced tests for spinach. See merge request !5230
Diffstat (limited to 'features')
-rw-r--r--features/support/env.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index ab3f0ca7aeb..f0a3dd8d2d0 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -13,7 +13,7 @@ require_relative 'rerun'
if ENV['CI']
require 'knapsack'
- Knapsack::Adapters::RSpecAdapter.bind
+ Knapsack::Adapters::SpinachAdapter.bind
end
%w(select2_helper test_env repo_helpers).each do |f|