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-21 16:33:25 +0300
committerShinya Maeda <shinya@gitlab.com>2017-11-28 14:47:59 +0300
commitcff4a50e53bb079c47790f21b147ea271f2c73f2 (patch)
treed12c786055884c607bed096082e088d51fb55e62 /spec/models/clusters
parent0d95ce51be77d2a2a3e8421c56da6a8e5762a44f (diff)
Fix tests for Clusters::Platforms::Kubernetes
Diffstat (limited to 'spec/models/clusters')
-rw-r--r--spec/models/clusters/platforms/kubernetes_spec.rb16
1 files changed, 4 insertions, 12 deletions
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb
index 4ad6e214e2a..07bb2d637f9 100644
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
@@ -161,16 +161,8 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
end
end
- describe '.namespace_for_project' do
- subject { described_class.namespace_for_project(project) }
-
- let(:project) { create(:project) }
-
- it { is_expected.to eq("#{project.path}-#{project.id}") }
- end
-
describe '#default_namespace' do
- subject { kubernetes.default_namespace }
+ subject { kubernetes.send(:default_namespace) }
let(:kubernetes) { create(:cluster_platform_kubernetes, :configured) }
@@ -190,7 +182,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
describe '#predefined_variables' do
let!(:cluster) { create(:cluster, :project, platform_kubernetes: kubernetes) }
- let(:kubernetes) { create(:platform_kubernetes, api_url: api_url, ca_cert: ca_pem, token: token) }
+ let(:kubernetes) { create(:cluster_platform_kubernetes, api_url: api_url, ca_cert: ca_pem, token: token) }
let(:api_url) { 'https://kube.domain.com' }
let(:ca_pem) { 'CA PEM DATA' }
let(:token) { 'token' }
@@ -248,7 +240,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
let!(:cluster) { create(:cluster, :project, platform_kubernetes: service) }
let(:project) { cluster.project }
- let(:service) { create(:platform_kubernetes, :configured) }
+ let(:service) { create(:cluster_platform_kubernetes, :configured) }
let(:environment) { build(:environment, project: project, name: "env", slug: "env-000000") }
context 'with invalid pods' do
@@ -287,7 +279,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
subject { service.calculate_reactive_cache }
let!(:cluster) { create(:cluster, :project, enabled: enabled, platform_kubernetes: service) }
- let(:service) { create(:platform_kubernetes, :configured) }
+ let(:service) { create(:cluster_platform_kubernetes, :configured) }
let(:enabled) { true }
context 'when cluster is disabled' do