f9c456bd0c
Previously, we called the `peek_enabled?` method like so:
prepend_before_action :set_peek_request_id, if: :peek_enabled?
Now we don't have a `set_peek_request_id` method, so we don't need that
line. However, the `peek_enabled?` part had a side-effect: it would also
populate the request store cache for whether the performance bar was
enabled for the current request or not.
This commit makes that side-effect explicit, and replaces all uses of
`peek_enabled?` with the more explicit
`Gitlab::PerformanceBar.enabled_for_request?`. There is one spec that
still sets `SafeRequestStore[:peek_enabled]` directly, because it is
contrasting behaviour with and without a request store enabled.
The upshot is:
1. We still set the value in one place. We make it more explicit that
that's what we're doing.
2. Reading that value uses a consistent method so it's easier to find in
future.
42 lines
1.4 KiB
Ruby
42 lines
1.4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'spec_helper'
|
|
|
|
describe Peek::Views::Rugged, :request_store do
|
|
subject { described_class.new }
|
|
|
|
let(:project) { create(:project) }
|
|
|
|
before do
|
|
allow(Gitlab::PerformanceBar).to receive(:enabled_for_request?).and_return(true)
|
|
end
|
|
|
|
it 'returns no results' do
|
|
expect(subject.results).to eq({})
|
|
end
|
|
|
|
it 'returns aggregated results' do
|
|
::Gitlab::RuggedInstrumentation.query_time += 1.234
|
|
::Gitlab::RuggedInstrumentation.increment_query_count
|
|
::Gitlab::RuggedInstrumentation.increment_query_count
|
|
|
|
::Gitlab::RuggedInstrumentation.add_call_details(feature: :rugged_test,
|
|
args: [project.repository.raw, 'HEAD'],
|
|
duration: 0.123)
|
|
::Gitlab::RuggedInstrumentation.add_call_details(feature: :rugged_test2,
|
|
args: [project.repository, 'refs/heads/master'],
|
|
duration: 0.456)
|
|
|
|
results = subject.results
|
|
expect(results[:calls]).to eq(2)
|
|
expect(results[:duration]).to eq('1234.00ms')
|
|
expect(results[:details].count).to eq(2)
|
|
|
|
expected = [
|
|
[project.repository.raw.to_s, "HEAD"],
|
|
[project.repository.to_s, "refs/heads/master"]
|
|
]
|
|
|
|
expect(results[:details].map { |data| data[:args] }).to match_array(expected)
|
|
end
|
|
end
|