diff options
| -rw-r--r-- | spec/controllers/metrics_controller_spec.rb | 10 | ||||
| -rw-r--r-- | spec/lib/gitlab/metrics_spec.rb | 9 |
2 files changed, 4 insertions, 15 deletions
diff --git a/spec/controllers/metrics_controller_spec.rb b/spec/controllers/metrics_controller_spec.rb index b26ebc1377b..044c9f179ed 100644 --- a/spec/controllers/metrics_controller_spec.rb +++ b/spec/controllers/metrics_controller_spec.rb @@ -5,17 +5,11 @@ describe MetricsController do let(:token) { current_application_settings.health_check_access_token } let(:json_response) { JSON.parse(response.body) } - - around do |example| - Dir.mktmpdir do |tmp_dir| - @metrics_multiproc_dir = tmp_dir - example.run - end - end + let(:metrics_multiproc_dir) { Dir.mktmpdir } before do stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') - stub_env('prometheus_multiproc_dir', @metrics_multiproc_dir) + stub_env('prometheus_multiproc_dir', metrics_multiproc_dir) allow(Gitlab::Metrics).to receive(:prometheus_metrics_enabled?).and_return(true) end diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb index 87c9f4ebda4..5a87b906609 100644 --- a/spec/lib/gitlab/metrics_spec.rb +++ b/spec/lib/gitlab/metrics_spec.rb @@ -281,15 +281,10 @@ describe Gitlab::Metrics do end context 'prometheus metrics enabled' do - around do |example| - Dir.mktmpdir do |tmp_dir| - @metrics_multiproc_dir = tmp_dir - example.run - end - end + let(:metrics_multiproc_dir) { Dir.mktmpdir } before do - stub_const('Prometheus::Client::Multiprocdir', @metrics_multiproc_dir) + stub_const('Prometheus::Client::Multiprocdir', metrics_multiproc_dir) allow(described_class).to receive(:prometheus_metrics_enabled?).and_return(true) end |