Minor updates to spec for readability

Based on BE reviewer feedback
This commit is contained in:
Thong Kuah 2018-11-06 21:10:42 +13:00
parent 675bfd50a9
commit 5303718402
2 changed files with 35 additions and 23 deletions

View file

@ -40,8 +40,15 @@ describe Groups::ClustersController do
describe 'functionality' do describe 'functionality' do
context 'when group has one or more clusters' do context 'when group has one or more clusters' do
let(:group) { create(:group) } let(:group) { create(:group) }
let!(:enabled_cluster) { create(:cluster, :provided_by_gcp, cluster_type: :group_type, groups: [group]) }
let!(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, :production_environment, cluster_type: :group_type, groups: [group]) } let!(:enabled_cluster) do
create(:cluster, :provided_by_gcp, cluster_type: :group_type, groups: [group])
end
let!(:disabled_cluster) do
create(:cluster, :disabled, :provided_by_gcp, :production_environment, cluster_type: :group_type, groups: [group])
end
it 'lists available clusters' do it 'lists available clusters' do
go go
@ -204,10 +211,13 @@ describe Groups::ClustersController do
expect(ClusterProvisionWorker).to receive(:perform_async) expect(ClusterProvisionWorker).to receive(:perform_async)
expect { go }.to change { Clusters::Cluster.count } expect { go }.to change { Clusters::Cluster.count }
.and change { Clusters::Providers::Gcp.count } .and change { Clusters::Providers::Gcp.count }
expect(response).to redirect_to(group_cluster_path(group, group.clusters.first))
expect(group.clusters.first).to be_gcp cluster = group.clusters.first
expect(group.clusters.first).to be_kubernetes
expect(group.clusters.first.provider_gcp).to be_legacy_abac expect(response).to redirect_to(group_cluster_path(group, cluster))
expect(cluster).to be_gcp
expect(cluster).to be_kubernetes
expect(cluster.provider_gcp).to be_legacy_abac
end end
context 'when legacy_abac param is false' do context 'when legacy_abac param is false' do
@ -289,10 +299,11 @@ describe Groups::ClustersController do
expect { go }.to change { Clusters::Cluster.count } expect { go }.to change { Clusters::Cluster.count }
.and change { Clusters::Platforms::Kubernetes.count } .and change { Clusters::Platforms::Kubernetes.count }
expect(response).to redirect_to(group_cluster_path(group, group.clusters.first)) cluster = group.clusters.first
expect(group.clusters.first).to be_user expect(response).to redirect_to(group_cluster_path(group, cluster))
expect(group.clusters.first).to be_kubernetes expect(cluster).to be_user
expect(cluster).to be_kubernetes
end end
end end
@ -317,11 +328,12 @@ describe Groups::ClustersController do
expect { go }.to change { Clusters::Cluster.count } expect { go }.to change { Clusters::Cluster.count }
.and change { Clusters::Platforms::Kubernetes.count } .and change { Clusters::Platforms::Kubernetes.count }
expect(response).to redirect_to(group_cluster_path(group, group.clusters.first)) cluster = group.clusters.first
expect(group.clusters.first).to be_user expect(response).to redirect_to(group_cluster_path(group, cluster))
expect(group.clusters.first).to be_kubernetes expect(cluster).to be_user
expect(group.clusters.first).to be_platform_kubernetes_rbac expect(cluster).to be_kubernetes
expect(cluster).to be_platform_kubernetes_rbac
end end
end end
end end
@ -349,7 +361,7 @@ describe Groups::ClustersController do
end end
describe 'functionality' do describe 'functionality' do
it "responds with matching schema" do it 'responds with matching schema' do
go go
expect(response).to have_gitlab_http_status(:ok) expect(response).to have_gitlab_http_status(:ok)
@ -385,7 +397,7 @@ describe Groups::ClustersController do
end end
describe 'functionality' do describe 'functionality' do
it "renders view" do it 'renders view' do
go go
expect(response).to have_gitlab_http_status(:ok) expect(response).to have_gitlab_http_status(:ok)
@ -428,7 +440,7 @@ describe Groups::ClustersController do
} }
end end
it "updates and redirects back to show page" do it 'updates and redirects back to show page' do
go go
cluster.reload cluster.reload
@ -454,7 +466,7 @@ describe Groups::ClustersController do
} }
end end
it "updates and redirects back to show page" do it 'updates and redirects back to show page' do
go(format: :json) go(format: :json)
cluster.reload cluster.reload
@ -477,7 +489,7 @@ describe Groups::ClustersController do
} }
end end
it "rejects changes" do it 'rejects changes' do
go(format: :json) go(format: :json)
expect(response).to have_http_status(:bad_request) expect(response).to have_http_status(:bad_request)
@ -512,7 +524,7 @@ describe Groups::ClustersController do
describe 'functionality' do describe 'functionality' do
context 'when cluster is provided by GCP' do context 'when cluster is provided by GCP' do
context 'when cluster is created' do context 'when cluster is created' do
it "destroys and redirects back to clusters list" do it 'destroys and redirects back to clusters list' do
expect { go } expect { go }
.to change { Clusters::Cluster.count }.by(-1) .to change { Clusters::Cluster.count }.by(-1)
.and change { Clusters::Platforms::Kubernetes.count }.by(-1) .and change { Clusters::Platforms::Kubernetes.count }.by(-1)
@ -526,7 +538,7 @@ describe Groups::ClustersController do
context 'when cluster is being created' do context 'when cluster is being created' do
let!(:cluster) { create(:cluster, :providing_by_gcp, :production_environment, cluster_type: :group_type, groups: [group]) } let!(:cluster) { create(:cluster, :providing_by_gcp, :production_environment, cluster_type: :group_type, groups: [group]) }
it "destroys and redirects back to clusters list" do it 'destroys and redirects back to clusters list' do
expect { go } expect { go }
.to change { Clusters::Cluster.count }.by(-1) .to change { Clusters::Cluster.count }.by(-1)
.and change { Clusters::Providers::Gcp.count }.by(-1) .and change { Clusters::Providers::Gcp.count }.by(-1)
@ -540,7 +552,7 @@ describe Groups::ClustersController do
context 'when cluster is provided by user' do context 'when cluster is provided by user' do
let!(:cluster) { create(:cluster, :provided_by_user, :production_environment, cluster_type: :group_type, groups: [group]) } let!(:cluster) { create(:cluster, :provided_by_user, :production_environment, cluster_type: :group_type, groups: [group]) }
it "destroys and redirects back to clusters list" do it 'destroys and redirects back to clusters list' do
expect { go } expect { go }
.to change { Clusters::Cluster.count }.by(-1) .to change { Clusters::Cluster.count }.by(-1)
.and change { Clusters::Platforms::Kubernetes.count }.by(-1) .and change { Clusters::Platforms::Kubernetes.count }.by(-1)

View file

@ -72,7 +72,7 @@ describe Clusters::UpdateService do
} }
end end
it "does not change cluster name" do it 'does not change cluster name' do
is_expected.to eq(false) is_expected.to eq(false)
cluster.reload cluster.reload
@ -82,7 +82,7 @@ describe Clusters::UpdateService do
context 'when cluster is being created' do context 'when cluster is being created' do
let(:cluster) { create(:cluster, :providing_by_gcp) } let(:cluster) { create(:cluster, :providing_by_gcp) }
it "rejects changes" do it 'rejects changes' do
is_expected.to eq(false) is_expected.to eq(false)
expect(cluster.errors.full_messages).to include('cannot modify during creation') expect(cluster.errors.full_messages).to include('cannot modify during creation')