Commit 5ee7c419 authored by rpereira2's avatar rpereira2

Call permit! on params

parent 16772b91
...@@ -9,7 +9,7 @@ class Projects::Environments::PrometheusApiController < Projects::ApplicationCon ...@@ -9,7 +9,7 @@ class Projects::Environments::PrometheusApiController < Projects::ApplicationCon
environment, environment,
request.method, request.method,
params[:proxy_path], params[:proxy_path],
params params.permit!
).execute ).execute
if result.nil? if result.nil?
......
...@@ -14,11 +14,22 @@ describe Projects::Environments::PrometheusApiController do ...@@ -14,11 +14,22 @@ describe Projects::Environments::PrometheusApiController do
describe 'GET #proxy' do describe 'GET #proxy' do
let(:prometheus_proxy_service) { instance_double(Prometheus::ProxyService) } let(:prometheus_proxy_service) { instance_double(Prometheus::ProxyService) }
let(:expected_params) do
ActionController::Parameters.new(
"query" => "1",
"id" => "1",
"namespace_id" => "namespace1",
"project_id" => "project1",
"proxy_path" => "query",
"controller" => "projects/environments/prometheus_api",
"action" => "proxy"
).permit!
end
context 'with valid requests' do context 'with valid requests' do
before do before do
allow(Prometheus::ProxyService).to receive(:new) allow(Prometheus::ProxyService).to receive(:new)
.with(environment, 'GET', 'query', anything) .with(environment, 'GET', 'query', expected_params)
.and_return(prometheus_proxy_service) .and_return(prometheus_proxy_service)
allow(prometheus_proxy_service).to receive(:execute) allow(prometheus_proxy_service).to receive(:execute)
...@@ -33,6 +44,8 @@ describe Projects::Environments::PrometheusApiController do ...@@ -33,6 +44,8 @@ describe Projects::Environments::PrometheusApiController do
it 'returns prometheus response' do it 'returns prometheus response' do
get :proxy, params: environment_params get :proxy, params: environment_params
expect(Prometheus::ProxyService).to have_received(:new)
.with(environment, 'GET', 'query', expected_params)
expect(response).to have_gitlab_http_status(:ok) expect(response).to have_gitlab_http_status(:ok)
expect(json_response).to eq(prometheus_json_body) expect(json_response).to eq(prometheus_json_body)
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