Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-07 10:52:55 +0300
committerShinya Maeda <shinya@gitlab.com>2017-11-07 10:52:55 +0300
commitdab3075a369c5966c6774d0c257833aebe9c447d (patch)
tree45ad09b605c925b90e56997baa781b82426c6ba4 /spec/serializers
parentc6c9b37b1d1c9304b0eef530adb4d32178adae16 (diff)
parent435fd9d073fec75e987a367f0eb9379948f2bbc3 (diff)
Merge branch 'master' into 38464-k8s-apps
Diffstat (limited to 'spec/serializers')
-rw-r--r--spec/serializers/cluster_entity_spec.rb4
-rw-r--r--spec/serializers/cluster_serializer_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/serializers/cluster_entity_spec.rb b/spec/serializers/cluster_entity_spec.rb
index abfc3731fb2..0a3cd2a65e1 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 04d8728303c..107c28dc7f7 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)