diff options
author | Alessio Caiazza <acaiazza@gitlab.com> | 2017-11-06 17:33:56 +0100 |
---|---|---|
committer | Alessio Caiazza <acaiazza@gitlab.com> | 2017-11-06 17:33:56 +0100 |
commit | 338d7612bcbb27b27cc0b9eadedf2a15c00c3e71 (patch) | |
tree | 45fbb2c5f1b5bc7f424ce8bd73809efce572bfd6 /spec/serializers | |
parent | 2802b5bb52b6ba28e6eeb1813f3fd3a79d2c03c4 (diff) | |
parent | a99ad59e655d66fda8af7f2b89aced79b8bc1060 (diff) | |
download | gitlab-ce-338d7612bcbb27b27cc0b9eadedf2a15c00c3e71.tar.gz |
Merge branch 'refactor-clusters' into 38464-k8s-apps
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/cluster_entity_spec.rb | 4 | ||||
-rw-r--r-- | spec/serializers/cluster_serializer_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/serializers/cluster_entity_spec.rb b/spec/serializers/cluster_entity_spec.rb index c58ee1a1ea6..67977e30264 100644 --- a/spec/serializers/cluster_entity_spec.rb +++ b/spec/serializers/cluster_entity_spec.rb @@ -8,7 +8,7 @@ describe ClusterEntity do let(:cluster) { create(:cluster, provider_type: :gcp, provider_gcp: provider) } context 'when status is creating' do - let(:provider) { create(:provider_gcp, :creating) } + let(:provider) { create(:cluster_provider_gcp, :creating) } it 'has corresponded data' do expect(subject[:status]).to eq(:creating) @@ -17,7 +17,7 @@ describe ClusterEntity do end context 'when status is errored' do - let(:provider) { create(:provider_gcp, :errored) } + let(:provider) { create(:cluster_provider_gcp, :errored) } it 'has corresponded data' do expect(subject[:status]).to eq(:errored) diff --git a/spec/serializers/cluster_serializer_spec.rb b/spec/serializers/cluster_serializer_spec.rb index a6dd2309663..5e9f7a45891 100644 --- a/spec/serializers/cluster_serializer_spec.rb +++ b/spec/serializers/cluster_serializer_spec.rb @@ -6,7 +6,7 @@ describe ClusterSerializer do context 'when provider type is gcp' do let(:cluster) { create(:cluster, provider_type: :gcp, provider_gcp: provider) } - let(:provider) { create(:provider_gcp, :errored) } + let(:provider) { create(:cluster_provider_gcp, :errored) } it 'serializes only status' do expect(subject.keys).to contain_exactly(:status, :status_reason, :applications) |