summaryrefslogtreecommitdiff
path: root/spec/fast_spec_helper.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-04-23 13:02:07 +0200
committerRémy Coutable <remy@rymai.me>2018-04-23 13:02:07 +0200
commit5b44097cf7a20a6bcdc38ac9ed43aac0ec33415e (patch)
tree79ff9cf1b17a16361803f7f50f6015572838a63a /spec/fast_spec_helper.rb
parentc286c66f57e4fd716fe1746363f8c7cf4205cee3 (diff)
downloadgitlab-ce-5b44097cf7a20a6bcdc38ac9ed43aac0ec33415e.tar.gz
Address latest feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/fast_spec_helper.rb')
-rw-r--r--spec/fast_spec_helper.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
index b3fe76fb150..105f70246c9 100644
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
@@ -1,19 +1,17 @@
require 'bundler/setup'
-require 'settingslogic'
-
ENV['GITLAB_ENV'] = 'test'
ENV['RAILS_ENV'] = 'test'
ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true'
-unless Kernel.respond_to?(:require_dependency)
- module Kernel
+unless Object.respond_to?(:require_dependency)
+ class Object
alias_method :require_dependency, :require
end
end
# Defines Gitlab and Gitlab.config which are at the center of the app
-unless defined?(Gitlab) && Gitlab.respond_to?(:config)
+unless defined?(Gitlab.config)
require_relative '../lib/settings'
require_relative '../config/initializers/2_app'
end