summaryrefslogtreecommitdiff
path: root/spec/controllers/groups/clusters_controller_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 09:09:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 09:09:06 +0000
commitd87918510a866a5fcbbc2f899ad65c6938ebf5f5 (patch)
tree3c864a44f28dc17bcba2bcea30e49e0c08bd0582 /spec/controllers/groups/clusters_controller_spec.rb
parentfa478f189009649b115136957e2da30d760fe391 (diff)
downloadgitlab-ce-d87918510a866a5fcbbc2f899ad65c6938ebf5f5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/groups/clusters_controller_spec.rb')
-rw-r--r--spec/controllers/groups/clusters_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/groups/clusters_controller_spec.rb b/spec/controllers/groups/clusters_controller_spec.rb
index cf90d388a61..cdb45e1946e 100644
--- a/spec/controllers/groups/clusters_controller_spec.rb
+++ b/spec/controllers/groups/clusters_controller_spec.rb
@@ -654,7 +654,7 @@ describe Groups::ClustersController do
go(format: :json)
cluster.reload
- expect(response).to have_http_status(:no_content)
+ expect(response).to have_gitlab_http_status(:no_content)
expect(cluster.enabled).to be_falsey
expect(cluster.name).to eq('my-new-cluster-name')
expect(cluster).not_to be_managed
@@ -674,7 +674,7 @@ describe Groups::ClustersController do
it 'rejects changes' do
go(format: :json)
- expect(response).to have_http_status(:bad_request)
+ expect(response).to have_gitlab_http_status(:bad_request)
end
end
end