summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-12-05 13:31:07 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-12-05 13:31:07 +0100
commit2fc29237aacd8df778ede532e450d06c79c63004 (patch)
treeffafca695f63d92897ce543c3c51fbf73a403d5d /spec/controllers
parent9429514e303bdceee0621b5c4bf02ad8ca0a7add (diff)
parentf1357a1e15bead6b58c049357c765dd991c04d9b (diff)
downloadgitlab-ce-2fc29237aacd8df778ede532e450d06c79c63004.tar.gz
Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-page-with-list-clusters
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/clusters_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index 806e33e0e4e..64e62411c9e 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -306,7 +306,7 @@ describe Projects::ClustersController do
go
cluster.reload
- expect(response).to redirect_to(namespace_project_cluster_path(project.namespace, project, project.cluster))
+ expect(response).to redirect_to(project_cluster_path(project, cluster))
expect(flash[:notice]).to eq('Cluster was successfully updated.')
expect(cluster.enabled).to be_falsey
expect(cluster.name).to eq('my-new-cluster-name')