diff options
author | rpereira2 <rpereira@gitlab.com> | 2019-04-04 19:16:45 +0530 |
---|---|---|
committer | rpereira2 <rpereira@gitlab.com> | 2019-04-05 02:12:34 +0530 |
commit | 20594de8cc3311ddc53b29ffdf60bcf4a580a5b3 (patch) | |
tree | a513458660256e26b50e543180110c8f0a2068ad | |
parent | 3888b4d35c8e6e24d1871bbc4ec2e1f63a19ed4d (diff) | |
download | gitlab-ce-58375-api-controller.tar.gz |
Use environment_params when defining expected_params58375-api-controller
-rw-r--r-- | spec/controllers/projects/environments/prometheus_api_controller_spec.rb | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb index f0de211c09c..5a0b92c2514 100644 --- a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb +++ b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb @@ -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) |