diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-19 12:15:49 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-19 12:15:49 +0200 |
| commit | 29c268ee4e21470cb7bbf13ce16b527b516225cb (patch) | |
| tree | e4641d285b37f9570600389d3ea03a3f2094b46f | |
| parent | 0bce9872b4c82ed172e2d811ab951ab5b034901f (diff) | |
| download | gitlab-ce-29c268ee4e21470cb7bbf13ce16b527b516225cb.tar.gz | |
Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty31933-improve-rspec-profiling-enabling
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | config/initializers/rspec_profiling.rb | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb index a7efd74f09e..16b9d5b15e5 100644 --- a/config/initializers/rspec_profiling.rb +++ b/config/initializers/rspec_profiling.rb @@ -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 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e2d5928e5b2..a58f4e664b7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -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' && |