diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/support/rspec.rb | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/support/rspec.rb')
| -rw-r--r-- | spec/support/rspec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/support/rspec.rb b/spec/support/rspec.rb index 7d011c5eb95..861b57c9efa 100644 --- a/spec/support/rspec.rb +++ b/spec/support/rspec.rb @@ -4,7 +4,8 @@ require_relative "helpers/stub_configuration" require_relative "helpers/stub_metrics" require_relative "helpers/stub_object_storage" require_relative "helpers/stub_env" -require_relative "helpers/expect_offense" +require_relative "helpers/fast_rails_root" +require 'rubocop/rspec/support' RSpec.configure do |config| config.mock_with :rspec @@ -14,6 +15,7 @@ RSpec.configure do |config| config.include StubMetrics config.include StubObjectStorage config.include StubENV + config.include FastRailsRoot - config.include ExpectOffense, type: :rubocop + config.include RuboCop::RSpec::ExpectOffense, type: :rubocop end |