diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-14 18:08:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-14 18:08:14 +0300 |
| commit | 87f286558de1f5790b0b1742f10548387b5d147a (patch) | |
| tree | c483d5f3542094d2123c8116ffee22430d9ad9c9 /spec/spec_helper.rb | |
| parent | 674e7e2c3d295704bdf504dd0caa2e5a2d9b5cd2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9bea732d1b2..e703747dc9c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,10 +8,12 @@ ENV["IN_MEMORY_APPLICATION_SETTINGS"] = 'true' ENV["RSPEC_ALLOW_INVALID_URLS"] = 'true' require File.expand_path('../config/environment', __dir__) + +require 'rspec/mocks' require 'rspec/rails' -require 'shoulda/matchers' require 'rspec/retry' require 'rspec-parameterized' +require 'shoulda/matchers' require 'test_prof/recipes/rspec/let_it_be' rspec_profiling_is_configured = |