From ee318727774dbec75d5506a4b4749fc4236206d5 Mon Sep 17 00:00:00 2001 From: Adam Niedzielski Date: Wed, 1 Mar 2017 18:15:28 +0100 Subject: Execute metrics initializer earlier This makes sure that Gitlab::Metrics::RackMiddleware is added before Gitlab::EtagCaching::Middleware. --- spec/initializers/8_metrics_spec.rb | 16 ++++++++++++++++ spec/initializers/metrics_spec.rb | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 spec/initializers/8_metrics_spec.rb delete mode 100644 spec/initializers/metrics_spec.rb (limited to 'spec/initializers') diff --git a/spec/initializers/8_metrics_spec.rb b/spec/initializers/8_metrics_spec.rb new file mode 100644 index 00000000000..570754621f3 --- /dev/null +++ b/spec/initializers/8_metrics_spec.rb @@ -0,0 +1,16 @@ +require 'spec_helper' +require_relative '../../config/initializers/8_metrics' + +describe 'instrument_classes', lib: true do + let(:config) { double(:config) } + + before do + allow(config).to receive(:instrument_method) + allow(config).to receive(:instrument_methods) + allow(config).to receive(:instrument_instance_methods) + end + + it 'can autoload and instrument all files' do + expect { instrument_classes(config) }.not_to raise_error + end +end diff --git a/spec/initializers/metrics_spec.rb b/spec/initializers/metrics_spec.rb deleted file mode 100644 index bb595162370..00000000000 --- a/spec/initializers/metrics_spec.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'spec_helper' -require_relative '../../config/initializers/metrics' - -describe 'instrument_classes', lib: true do - let(:config) { double(:config) } - - before do - allow(config).to receive(:instrument_method) - allow(config).to receive(:instrument_methods) - allow(config).to receive(:instrument_instance_methods) - end - - it 'can autoload and instrument all files' do - expect { instrument_classes(config) }.not_to raise_error - end -end -- cgit v1.2.3