summaryrefslogtreecommitdiff
path: root/spec/controllers/admin
diff options
context:
space:
mode:
authorTiger <twatson@gitlab.com>2019-06-07 11:24:59 +1000
committerTiger <twatson@gitlab.com>2019-06-18 09:09:11 +1000
commit5aa9b710be2e03b296b68942d4053fa0a24e884c (patch)
tree5c7e49194490d49422196c1fbf935058a2199bee /spec/controllers/admin
parent11810cb2b7185202c5178557ebb6205b27ed4148 (diff)
downloadgitlab-ce-5aa9b710be2e03b296b68942d4053fa0a24e884c.tar.gz
Allow switching clusters between managed/unmanaged
Any resources created while the cluster was managed will be untouched, allowing users to set/unset this flag as they please.
Diffstat (limited to 'spec/controllers/admin')
-rw-r--r--spec/controllers/admin/clusters_controller_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/controllers/admin/clusters_controller_spec.rb b/spec/controllers/admin/clusters_controller_spec.rb
index 7b77cb186a4..7709f525119 100644
--- a/spec/controllers/admin/clusters_controller_spec.rb
+++ b/spec/controllers/admin/clusters_controller_spec.rb
@@ -396,6 +396,7 @@ describe Admin::ClustersController do
cluster: {
enabled: false,
name: 'my-new-cluster-name',
+ managed: false,
base_domain: domain
}
}
@@ -409,6 +410,7 @@ describe Admin::ClustersController do
expect(flash[:notice]).to eq('Kubernetes cluster was successfully updated.')
expect(cluster.enabled).to be_falsey
expect(cluster.name).to eq('my-new-cluster-name')
+ expect(cluster).not_to be_managed
expect(cluster.domain).to eq('test-domain.com')
end
@@ -433,6 +435,7 @@ describe Admin::ClustersController do
cluster: {
enabled: false,
name: 'my-new-cluster-name',
+ managed: false,
domain: domain
}
}
@@ -445,6 +448,7 @@ describe Admin::ClustersController do
expect(response).to have_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
end
end