diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-02-07 13:38:15 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-02-07 13:38:15 +0000 |
commit | 43de4993efd33f99801a9b00a32c69c1eb6b1125 (patch) | |
tree | 8047f6623cfc3bc42079ea3af424b0cd165b850d /spec/controllers | |
parent | 5fc522ed4fabaedb67e010706336868fb2095122 (diff) | |
parent | d9af3752fcfa6e97bcec82515b0cbc1ab88285de (diff) | |
download | gitlab-ce-43de4993efd33f99801a9b00a32c69c1eb6b1125.tar.gz |
Merge branch '52363-ui-changes-to-cluster-and-ado-pages' into 'master'
Moves domain setting to Clusters page
Closes #52363
See merge request gitlab-org/gitlab-ce!24580
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/groups/clusters_controller_spec.rb | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/spec/controllers/groups/clusters_controller_spec.rb b/spec/controllers/groups/clusters_controller_spec.rb index 0f28499194e..360030102e0 100644 --- a/spec/controllers/groups/clusters_controller_spec.rb +++ b/spec/controllers/groups/clusters_controller_spec.rb @@ -429,12 +429,14 @@ describe Groups::ClustersController do end let(:cluster) { create(:cluster, :provided_by_user, cluster_type: :group_type, groups: [group]) } + let(:domain) { 'test-domain.com' } let(:params) do { cluster: { enabled: false, - name: 'my-new-cluster-name' + name: 'my-new-cluster-name', + base_domain: domain } } end @@ -447,6 +449,20 @@ describe Groups::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.domain).to eq('test-domain.com') + end + + context 'when domain is invalid' do + let(:domain) { 'not-a-valid-domain' } + + it 'should not update cluster attributes' do + go + + cluster.reload + expect(response).to render_template(:show) + expect(cluster.name).not_to eq('my-new-cluster-name') + expect(cluster.domain).not_to eq('test-domain.com') + end end context 'when format is json' do @@ -456,7 +472,8 @@ describe Groups::ClustersController do { cluster: { enabled: false, - name: 'my-new-cluster-name' + name: 'my-new-cluster-name', + domain: domain } } end |