diff options
author | Stan Hu <stanhu@gmail.com> | 2017-11-08 08:14:20 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-11-08 08:14:20 +0000 |
commit | cb606c5a79039706016c7537c8e72645b3668592 (patch) | |
tree | 847e1a42eb5c8d9ab34e2aab8d7e5236d38084b7 | |
parent | a979153b6469d328622e8d7ad2b286c6330e1520 (diff) | |
parent | 90edcb45cda088927f4af378c0aa0e7d7004f582 (diff) | |
download | gitlab-ce-cb606c5a79039706016c7537c8e72645b3668592.tar.gz |
Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into 'master'
Make BackgroundTransaction#labels public
See merge request gitlab-org/gitlab-ce!15257
-rw-r--r-- | lib/gitlab/metrics/background_transaction.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/metrics/background_transaction_spec.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/metrics/background_transaction.rb b/lib/gitlab/metrics/background_transaction.rb index d01de5eef0a..5919ebb1493 100644 --- a/lib/gitlab/metrics/background_transaction.rb +++ b/lib/gitlab/metrics/background_transaction.rb @@ -6,8 +6,6 @@ module Gitlab @worker_class = worker_class end - protected - def labels { controller: @worker_class.name, action: 'perform' } end diff --git a/spec/lib/gitlab/metrics/background_transaction_spec.rb b/spec/lib/gitlab/metrics/background_transaction_spec.rb index 96052b8dc2f..17445fe6de5 100644 --- a/spec/lib/gitlab/metrics/background_transaction_spec.rb +++ b/spec/lib/gitlab/metrics/background_transaction_spec.rb @@ -10,4 +10,10 @@ describe Gitlab::Metrics::BackgroundTransaction do expect(subject.action).to eq('TestWorker#perform') end end + + describe '#label' do + it 'returns labels based on class name' do + expect(subject.labels).to eq(controller: 'TestWorker', action: 'perform') + end + end end |