Commit cd94500a authored by syasonik's avatar syasonik

Address rubocop errors

parent 54dd4403
...@@ -16,8 +16,7 @@ module Gitlab ...@@ -16,8 +16,7 @@ module Gitlab
private private
def endpoint_for_metric(metric) def endpoint_for_metric(metric)
Gitlab::Routing.url_helpers.prometheus_api_namespace_project_environment_path( Gitlab::Routing.url_helpers.prometheus_api_project_environment_path(
project.namespace,
project, project,
environment, environment,
proxy_path: query_type(metric), proxy_path: query_type(metric),
......
...@@ -11,11 +11,14 @@ describe Gitlab::Metrics::Dashboard::Processor do ...@@ -11,11 +11,14 @@ describe Gitlab::Metrics::Dashboard::Processor do
let(:process_params) { [project, environment, dashboard_yml] } let(:process_params) { [project, environment, dashboard_yml] }
let(:dashboard) { described_class.new(*process_params).process(insert_project_metrics: true) } let(:dashboard) { described_class.new(*process_params).process(insert_project_metrics: true) }
# rubocop:disable RSpec/IteratedExpectation
# Cop disabled "all" matcher doesn't offer access to the element
it 'includes a path for the prometheus endpoint with each metric' do it 'includes a path for the prometheus endpoint with each metric' do
all_metrics.each do |metric| all_metrics.each do |metric|
expect(metric).to include(prometheus_endpoint_path: prometheus_path(metric[:query_range])) expect(metric).to include(prometheus_endpoint_path: prometheus_path(metric[:query_range]))
end end
end end
# rubocop:enable RSpec/IteratedExpectation
context 'when dashboard config corresponds to common metrics' do context 'when dashboard config corresponds to common metrics' do
let!(:common_metric) { create(:prometheus_metric, :common, identifier: 'metric_a1') } let!(:common_metric) { create(:prometheus_metric, :common, identifier: 'metric_a1') }
...@@ -114,6 +117,6 @@ describe Gitlab::Metrics::Dashboard::Processor do ...@@ -114,6 +117,6 @@ describe Gitlab::Metrics::Dashboard::Processor do
"/#{project.namespace.path}" \ "/#{project.namespace.path}" \
"/#{project.name}/environments/" \ "/#{project.name}/environments/" \
"#{environment.id}/prometheus/api/v1" \ "#{environment.id}/prometheus/api/v1" \
"/query_range?query=#{CGI::escape query}" "/query_range?query=#{CGI.escape query}"
end end
end 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