summaryrefslogtreecommitdiff
path: root/lib/gitlab/runtime.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/runtime.rb')
-rw-r--r--lib/gitlab/runtime.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/gitlab/runtime.rb b/lib/gitlab/runtime.rb
index 97f7a8e2800..64ab020a30e 100644
--- a/lib/gitlab/runtime.rb
+++ b/lib/gitlab/runtime.rb
@@ -16,7 +16,7 @@ module Gitlab
matches << :console if console?
matches << :sidekiq if sidekiq?
matches << :rake if rake?
- matches << :rspec if rspec?
+ matches << :test_suite if test_suite?
if matches.one?
matches.first
@@ -48,8 +48,8 @@ module Gitlab
!!(defined?(::Rake) && Rake.application.top_level_tasks.any?)
end
- def rspec?
- Rails.env.test? && process_name == 'rspec'
+ def test_suite?
+ Rails.env.test?
end
def console?
@@ -64,10 +64,6 @@ module Gitlab
puma? || sidekiq?
end
- def process_name
- File.basename($0)
- end
-
def max_threads
if puma?
Puma.cli_config.options[:max_threads]