Skip to content
Snippets Groups Projects
Commit 549e5427 authored by Stan Hu's avatar Stan Hu
Browse files

Merge branch '31933-improve-rspec-profiling-enabling' into 'master'

Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty

Closes #31933

See merge request !11543

Former-commit-id: 9d29eb7e
parents 048fb2a1 7d36927c
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -32,7 +32,7 @@ end
 
if Rails.env.test?
RspecProfiling.configure do |config|
if ENV['RSPEC_PROFILING_POSTGRES_URL']
if ENV['RSPEC_PROFILING_POSTGRES_URL'].present?
RspecProfiling::Collectors::PSQL.prepend(RspecProfilingExt::PSQL)
config.collector = RspecProfiling::Collectors::PSQL
end
Loading
Loading
Loading
Loading
@@ -10,7 +10,7 @@ require 'shoulda/matchers'
require 'rspec/retry'
 
rspec_profiling_is_configured =
ENV['RSPEC_PROFILING_POSTGRES_URL'] ||
ENV['RSPEC_PROFILING_POSTGRES_URL'].present? ||
ENV['RSPEC_PROFILING']
branch_can_be_profiled =
ENV['GITLAB_DATABASE'] == 'postgresql' &&
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment