diff --git a/scripts/override_rails_constants.rb b/metrics_server/override_rails_constants.rb similarity index 86% rename from scripts/override_rails_constants.rb rename to metrics_server/override_rails_constants.rb index 1b255dd00117405fc1d6793d20432477aae75547..76e49edfbb04cf6e614963e7683e204378c0626a 100644 --- a/scripts/override_rails_constants.rb +++ b/metrics_server/override_rails_constants.rb @@ -3,12 +3,12 @@ require 'active_support/environment_inquirer' -module Rails # rubocop:disable Gitlab/NamespacedClass +module Rails extend self def env @env ||= ActiveSupport::EnvironmentInquirer.new( - ENV["RAILS_ENV"].presence || ENV["RACK_ENV"].presence || "test" + ENV["RAILS_ENV"].presence || ENV["RACK_ENV"].presence || "development" ) end diff --git a/metrics_server/settings_overrides.rb b/metrics_server/settings_overrides.rb index 4239f62ad1cb1eee449d0f1f8d8edeaa959ff900..8572b4f86b015333ef75c220556175982ef5b653 100644 --- a/metrics_server/settings_overrides.rb +++ b/metrics_server/settings_overrides.rb @@ -7,7 +7,7 @@ # to all necessary constants. For example, we need Rails.root to # determine the location of bin/metrics-server. # Here we make the necessary constants available conditionally. -require_relative '../scripts/override_rails_constants' unless Object.const_defined?('Rails') +require_relative 'override_rails_constants' unless Object.const_defined?('Rails') require_relative '../config/settings' diff --git a/scripts/setup-test-env b/scripts/setup-test-env index c955a01d769355d2b508c13132a19e7103f4bf29..a81aaa5cda34b947b33988844a677bc20bf22661 100755 --- a/scripts/setup-test-env +++ b/scripts/setup-test-env @@ -13,7 +13,17 @@ require 'active_support/string_inquirer' ENV['SKIP_RAILS_ENV_IN_RAKE'] = 'true' -require_relative 'override_rails_constants' +module Rails + extend self + + def root + Pathname.new(File.expand_path('..', __dir__)) + end + + def env + @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "test") + end +end ActiveSupport::Dependencies.autoload_paths << 'lib'