diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-06 09:06:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-06 09:06:10 +0300 |
commit | 505c40d537244b35807129ade0c577f752e9d564 (patch) | |
tree | 3587929b43857290165eb275477d0f3a30564038 /spec/models/clusters | |
parent | 39c1c5d3343687cc55600646d0d17aa56f44662a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/clusters')
-rw-r--r-- | spec/models/clusters/cluster_spec.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb index 47530025620..198a3dfd37a 100644 --- a/spec/models/clusters/cluster_spec.rb +++ b/spec/models/clusters/cluster_spec.rb @@ -55,7 +55,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do let!(:cluster) { create(:cluster, enabled: true) } before do - create(:cluster, enabled: false) + create(:cluster, :disabled) end it { is_expected.to contain_exactly(cluster) } @@ -64,7 +64,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do describe '.disabled' do subject { described_class.disabled } - let!(:cluster) { create(:cluster, enabled: false) } + let!(:cluster) { create(:cluster, :disabled) } before do create(:cluster, enabled: true) @@ -76,10 +76,10 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do describe '.user_provided' do subject { described_class.user_provided } - let!(:cluster) { create(:cluster, :provided_by_user) } + let!(:cluster) { create(:cluster_platform_kubernetes).cluster } before do - create(:cluster, :provided_by_gcp) + create(:cluster_provider_gcp, :created) end it { is_expected.to contain_exactly(cluster) } @@ -88,7 +88,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do describe '.gcp_provided' do subject { described_class.gcp_provided } - let!(:cluster) { create(:cluster, :provided_by_gcp) } + let!(:cluster) { create(:cluster_provider_gcp, :created).cluster } before do create(:cluster, :provided_by_user) @@ -100,7 +100,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do describe '.gcp_installed' do subject { described_class.gcp_installed } - let!(:cluster) { create(:cluster, :provided_by_gcp) } + let!(:cluster) { create(:cluster_provider_gcp, :created).cluster } before do create(:cluster, :providing_by_gcp) @@ -112,7 +112,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do describe '.aws_provided' do subject { described_class.aws_provided } - let!(:cluster) { create(:cluster, :provided_by_aws) } + let!(:cluster) { create(:cluster_provider_aws, :created).cluster } before do create(:cluster, :provided_by_user) @@ -124,11 +124,11 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do describe '.aws_installed' do subject { described_class.aws_installed } - let!(:cluster) { create(:cluster, :provided_by_aws) } + let!(:cluster) { create(:cluster_provider_aws, :created).cluster } before do - errored_cluster = create(:cluster, :provided_by_aws) - errored_cluster.provider.make_errored!("Error message") + errored_provider = create(:cluster_provider_aws) + errored_provider.make_errored!("Error message") end it { is_expected.to contain_exactly(cluster) } |