kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make production settings fixture use Gitlab::CurrentSettings.current_application_settings 

small code formatting changes
This commit is contained in:
Pawel Chojnacki 2017-06-02 15:25:54 +02:00
parent c86e1437eb
commit 6a67148ed3
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
db/fixtures/production/010_settings.rb
View File

@ -12,18 +12,15 @@ def save(settings, topic)
end
end
envs = %w{ GITLAB_PROMETHEUS_METRICS_ENABLED GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN }
if envs.any? {|env_name| ENV[env_name].present? }
settings = ApplicationSetting.current || ApplicationSetting.create_from_defaults
if ENV['GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN'].present?
settings.set_runners_registration_token(ENV['GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN'])
save(settings, 'Runner Registration Token')
end
if ENV['GITLAB_PROMETHEUS_METRICS_ENABLED'].present?
value = Gitlab::Utils.to_boolean(ENV['GITLAB_PROMETHEUS_METRICS_ENABLED'])
settings.prometheus_metrics_enabled = value
save(settings, 'Prometheus metrics enabled flag')
end
if ENV['GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN'].present?
settings = Gitlab::CurrentSettings.current_application_settings
settings.set_runners_registration_token(ENV['GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN'])
save(settings, 'Runner Registration Token')
end
if ENV['GITLAB_PROMETHEUS_METRICS_ENABLED'].present?
settings = Gitlab::CurrentSettings.current_application_settings
value = Gitlab::Utils.to_boolean(ENV['GITLAB_PROMETHEUS_METRICS_ENABLED'])
settings.prometheus_metrics_enabled = value
save(settings, 'Prometheus metrics enabled flag')
end

4
spec/db/production/settings_spec.rb
View File

@ -3,8 +3,8 @@ require 'rainbow/ext/string'
describe 'seed production settings', lib: true do
include StubENV
let(:settings_file) { File.join(__dir__, '../../../db/fixtures/production/010_settings.rb') }
let(:settings) { ApplicationSetting.current || ApplicationSetting.create_from_defaults }
let(:settings_file) { Rails.root.join('db/fixtures/production/010_settings.rb') }
let(:settings) { Gitlab::CurrentSettings.current_application_settings }
context 'GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN is set in the environment' do
before do

14
spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
View File

@ -4,10 +4,8 @@ describe Gitlab::HealthChecks::PrometheusTextFormat do
describe '#marshal' do
let(:sample_metrics) do
[
metric_class.new('metric1', 1),
metric_class.new('metric2', 2)
]
[metric_class.new('metric1', 1),
metric_class.new('metric2', 2)]
end
it 'marshal to text with non repeating type definition' do
@ -23,11 +21,9 @@ describe Gitlab::HealthChecks::PrometheusTextFormat do
context 'metrics where name repeats' do
let(:sample_metrics) do
[
metric_class.new('metric1', 1),
metric_class.new('metric1', 2),
metric_class.new('metric2', 3)
]
[metric_class.new('metric1', 1),
metric_class.new('metric1', 2),
metric_class.new('metric2', 3)]
end
it 'marshal to text with non repeating type definition' do