Commit c361c1e8 authored by Pawel Chojnacki's avatar Pawel Chojnacki
Browse files

Adjust test to changed metrics methods.

+ remove deprecated test suite
parent eabf9b68d257
......@@ -53,7 +53,7 @@ def safe_provide_metric(method, name, *args)
return metric if metric
PROVIDER_MUTEX.synchronize do
provide_metric(name) || registry.send(method, *args)
provide_metric(name) || registry.send(method, name, *args)
end
end
......
......@@ -18,20 +18,6 @@
expect(middleware.call(env)).to eq('yay')
end
xit 'tags a transaction with the name and action of a controller' do
klass = double(:klass, name: 'TestController')
controller = double(:controller, class: klass, action_name: 'show', content_type: 'text/html')
env['action_controller.instance'] = controller
allow(app).to receive(:call).with(env)
expect(middleware).to receive(:tag_controller)
.with(an_instance_of(Gitlab::Metrics::Transaction), env)
middleware.call(env)
end
it 'tracks any raised exceptions' do
expect(app).to receive(:call).with(env).and_raise(RuntimeError)
......
......@@ -199,7 +199,7 @@
shared_examples 'prometheus metrics API' do
describe '#counter' do
subject { described_class.counter(:couter, 'doc') }
subject { described_class.counter(:counter, 'doc') }
describe '#increment' do
it 'successfully calls #increment without arguments' do
......@@ -255,7 +255,7 @@
it_behaves_like 'prometheus metrics API'
describe '#null_metric' do
subject { described_class.provide_metric(:test) }
subject { described_class.send(:provide_metric, :test) }
it { is_expected.to be_a(Gitlab::Metrics::NullMetric) }
end
......@@ -296,7 +296,7 @@
it_behaves_like 'prometheus metrics API'
describe '#null_metric' do
subject { described_class.provide_metric(:test) }
subject { described_class.send(:provide_metric, :test) }
it { is_expected.to be_nil }
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment