diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-12 12:09:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-12 12:09:09 +0300 |
| commit | ede2fbdc8734f095d371614d362b5ae373d6a243 (patch) | |
| tree | 187152bbc2a4f24aae99d30a78ca9b06cc0468a8 /spec/spec_helper.rb | |
| parent | 4044a01bd7e32c814217b34c512c3dd02202ea29 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1550e2f9b3b..487c7bb10e2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -15,6 +15,9 @@ Warning[:deprecated] = true unless ENV.key?('SILENCE_DEPRECATIONS') require './spec/deprecation_toolkit_env' DeprecationToolkitEnv.configure! +require './spec/knapsack_env' +KnapsackEnv.configure! + require './spec/simplecov_env' SimpleCovEnv.start! @@ -47,11 +50,6 @@ if rspec_profiling_is_configured && (!ENV.key?('CI') || branch_can_be_profiled) require 'rspec_profiling/rspec' end -if ENV['CI'] && ENV['KNAPSACK_GENERATE_REPORT'] && !ENV['NO_KNAPSACK'] - require 'knapsack' - Knapsack::Adapters::RSpecAdapter.bind -end - # require rainbow gem String monkeypatch, so we can test SystemChecks require 'rainbow/ext/string' Rainbow.enabled = false @@ -81,7 +79,7 @@ RSpec.configure do |config| config.run_all_when_everything_filtered = true config.use_transactional_fixtures = true - config.use_instantiated_fixtures = false + config.use_instantiated_fixtures = false config.fixture_path = Rails.root config.verbose_retry = true |