diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rwxr-xr-x | Rakefile | 2 | ||||
| -rw-r--r-- | features/support/env.rb | 4 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 2 |
5 files changed, 8 insertions, 6 deletions
@@ -313,7 +313,7 @@ group :test do gem 'webmock', '~> 1.21.0' gem 'test_after_commit', '~> 0.4.2' gem 'sham_rack' - gem 'knapsack' + gem 'knapsack-gitlab' end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index 930a0f3f8d2..c04a3b1351d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -358,7 +358,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - knapsack (1.9.0) + knapsack-gitlab (1.9.0) rake timecop (>= 0.1.0) launchy (2.4.3) @@ -878,7 +878,7 @@ DEPENDENCIES jquery-ui-rails (~> 5.0.0) jwt kaminari (~> 0.17.0) - knapsack + knapsack-gitlab letter_opener_web (~> 1.3.0) licensee (~> 8.0.0) loofah (~> 2.0.3) @@ -3,7 +3,7 @@ # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. require File.expand_path('../config/application', __FILE__) -require 'knapsack' +require 'knapsack-gitlab' relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__) require relative_url_conf if File.exist?("#{relative_url_conf}.rb") 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 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 84b9ee75f6a..f6d8dd42249 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -15,7 +15,7 @@ require 'rspec/rails' require 'shoulda/matchers' require 'sidekiq/testing/inline' require 'rspec/retry' -require 'knapsack' +require 'knapsack-gitlab' require_relative 'knapsack_merger' Knapsack::Adapters::RSpecAdapter.bind |