Use environment_params when defining expected_params

This commit is contained in:
rpereira2 2019-04-04 19:16:45 +05:30
parent 3888b4d35c
commit 20594de8cc
1 changed files with 8 additions and 10 deletions

View File

@ -16,13 +16,11 @@ describe Projects::Environments::PrometheusApiController do
let(:prometheus_proxy_service) { instance_double(Prometheus::ProxyService) }
let(:expected_params) do
ActionController::Parameters.new(
"query" => "1",
"id" => environment.id.to_s,
"namespace_id" => project.namespace.name,
"project_id" => project.name,
"proxy_path" => "query",
"controller" => "projects/environments/prometheus_api",
"action" => "proxy"
environment_params(
proxy_path: 'query',
controller: 'projects/environments/prometheus_api',
action: 'proxy'
)
).permit!
end
@ -144,9 +142,9 @@ describe Projects::Environments::PrometheusApiController do
def environment_params(params = {})
{
id: environment.id,
namespace_id: project.namespace,
project_id: project,
id: environment.id.to_s,
namespace_id: project.namespace.name,
project_id: project.name,
proxy_path: 'query',
query: '1'
}.merge(params)