Use own version of knapsack which supports spinach tests
This commit is contained in:
parent
8d8d2759ef
commit
77f8deec2c
2
Gemfile
2
Gemfile
|
@ -313,7 +313,7 @@ group :test do
|
||||||
gem 'webmock', '~> 1.21.0'
|
gem 'webmock', '~> 1.21.0'
|
||||||
gem 'test_after_commit', '~> 0.4.2'
|
gem 'test_after_commit', '~> 0.4.2'
|
||||||
gem 'sham_rack'
|
gem 'sham_rack'
|
||||||
gem 'knapsack'
|
gem 'knapsack-gitlab'
|
||||||
end
|
end
|
||||||
|
|
||||||
group :production do
|
group :production do
|
||||||
|
|
|
@ -358,7 +358,7 @@ GEM
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
kgio (2.10.0)
|
kgio (2.10.0)
|
||||||
knapsack (1.9.0)
|
knapsack-gitlab (1.9.0)
|
||||||
rake
|
rake
|
||||||
timecop (>= 0.1.0)
|
timecop (>= 0.1.0)
|
||||||
launchy (2.4.3)
|
launchy (2.4.3)
|
||||||
|
@ -878,7 +878,7 @@ DEPENDENCIES
|
||||||
jquery-ui-rails (~> 5.0.0)
|
jquery-ui-rails (~> 5.0.0)
|
||||||
jwt
|
jwt
|
||||||
kaminari (~> 0.17.0)
|
kaminari (~> 0.17.0)
|
||||||
knapsack
|
knapsack-gitlab
|
||||||
letter_opener_web (~> 1.3.0)
|
letter_opener_web (~> 1.3.0)
|
||||||
licensee (~> 8.0.0)
|
licensee (~> 8.0.0)
|
||||||
loofah (~> 2.0.3)
|
loofah (~> 2.0.3)
|
||||||
|
|
2
Rakefile
2
Rakefile
|
@ -3,7 +3,7 @@
|
||||||
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
|
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
|
||||||
|
|
||||||
require File.expand_path('../config/application', __FILE__)
|
require File.expand_path('../config/application', __FILE__)
|
||||||
require 'knapsack'
|
require 'knapsack-gitlab'
|
||||||
|
|
||||||
relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
|
relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
|
||||||
require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
|
require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
|
||||||
|
|
|
@ -11,12 +11,14 @@ ENV['RAILS_ENV'] = 'test'
|
||||||
require './config/environment'
|
require './config/environment'
|
||||||
require 'rspec/expectations'
|
require 'rspec/expectations'
|
||||||
require 'sidekiq/testing/inline'
|
require 'sidekiq/testing/inline'
|
||||||
require 'knapsack'
|
require 'knapsack-gitlab'
|
||||||
|
|
||||||
require_relative 'capybara'
|
require_relative 'capybara'
|
||||||
require_relative 'db_cleaner'
|
require_relative 'db_cleaner'
|
||||||
require_relative 'rerun'
|
require_relative 'rerun'
|
||||||
|
|
||||||
|
Knapsack::Adapters::SpinachAdapter.bind
|
||||||
|
|
||||||
%w(select2_helper test_env repo_helpers).each do |f|
|
%w(select2_helper test_env repo_helpers).each do |f|
|
||||||
require Rails.root.join('spec', 'support', f)
|
require Rails.root.join('spec', 'support', f)
|
||||||
end
|
end
|
||||||
|
|
|
@ -15,7 +15,7 @@ require 'rspec/rails'
|
||||||
require 'shoulda/matchers'
|
require 'shoulda/matchers'
|
||||||
require 'sidekiq/testing/inline'
|
require 'sidekiq/testing/inline'
|
||||||
require 'rspec/retry'
|
require 'rspec/retry'
|
||||||
require 'knapsack'
|
require 'knapsack-gitlab'
|
||||||
require_relative 'knapsack_merger'
|
require_relative 'knapsack_merger'
|
||||||
|
|
||||||
Knapsack::Adapters::RSpecAdapter.bind
|
Knapsack::Adapters::RSpecAdapter.bind
|
||||||
|
|
Loading…
Reference in New Issue