summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 09:09:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 09:09:31 +0000
commit04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch)
tree7cb9c0977e09d97da340f48703d79b2dbd3579a0 /spec/controllers
parent42f41de46525ce0065f02ee07c1a79f5669526a0 (diff)
downloadgitlab-ce-04baa85554ff13bdd4d6f4e6bb24119d17608fee.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/grafana_api_controller_spec.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/spec/controllers/projects/grafana_api_controller_spec.rb b/spec/controllers/projects/grafana_api_controller_spec.rb
index 0ef96514961..c62baa30fde 100644
--- a/spec/controllers/projects/grafana_api_controller_spec.rb
+++ b/spec/controllers/projects/grafana_api_controller_spec.rb
@@ -20,8 +20,8 @@ describe Projects::GrafanaApiController do
proxy_path: 'api/v1/query_range',
datasource_id: '1',
query: 'rate(relevant_metric)',
- start: '1570441248',
- end: '1570444848',
+ start_time: '1570441248',
+ end_time: '1570444848',
step: '900'
}
end
@@ -50,7 +50,10 @@ describe Projects::GrafanaApiController do
expect(Grafana::ProxyService)
.to have_received(:new)
.with(project, '1', 'api/v1/query_range',
- params.slice(:query, :start, :end, :step).stringify_keys)
+ { 'query' => params[:query],
+ 'start' => params[:start_time],
+ 'end' => params[:end_time],
+ 'step' => params[:step] })
expect(response).to have_gitlab_http_status(:ok)
expect(json_response).to eq({})