diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-11-03 03:37:32 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-03 03:37:32 +0900 |
commit | 3602c0b9874c6b93e6cf55e1cb0238951784604d (patch) | |
tree | 06c954ed572fdeba505f742ae2e878655288b54d /spec/services | |
parent | b129f06733c7994fb81cef4d0bae6d6611647a83 (diff) | |
download | gitlab-ce-3602c0b9874c6b93e6cf55e1cb0238951784604d.tar.gz |
Fix some tests
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/clusters/create_service_spec.rb | 106 | ||||
-rw-r--r-- | spec/services/clusters/gcp/finalize_creation_service_spec.rb | 1 |
2 files changed, 49 insertions, 58 deletions
diff --git a/spec/services/clusters/create_service_spec.rb b/spec/services/clusters/create_service_spec.rb index 9ed6ae8c2fc..9c2c288a2fa 100644 --- a/spec/services/clusters/create_service_spec.rb +++ b/spec/services/clusters/create_service_spec.rb @@ -11,11 +11,7 @@ describe Clusters::CreateService do let(:params) do { name: 'test-cluster', - platform_type: :kubernetes, provider_type: :gcp, - platform_kubernetes_attributes: { - namespace: 'custom-namespace' - }, provider_gcp_attributes: { gcp_project_id: 'gcp-project', zone: 'us-central1-a', @@ -30,7 +26,6 @@ describe Clusters::CreateService do expect { result } .to change { Clusters::Cluster.count }.by(1) - .and change { Clusters::Platforms::Kubernetes.count }.by(1) .and change { Clusters::Providers::Gcp.count }.by(1) expect(result.name).to eq('test-cluster') @@ -41,9 +36,7 @@ describe Clusters::CreateService do expect(result.provider.num_nodes).to eq(1) expect(result.provider.machine_type).to eq('machine_type-a') expect(result.provider.access_token).to eq(access_token) - expect(result.platform.namespace).to eq('custom-namespace') - expect(result.platform.api_url).to eq(Clusters::CreateService::TEMPOLARY_API_URL) - expect(result.platform.token).to eq(Clusters::CreateService::TEMPOLARY_TOKEN) + expect(result.platform).to be_nil end end @@ -51,11 +44,7 @@ describe Clusters::CreateService do let(:params) do { name: 'test-cluster', - platform_type: :kubernetes, provider_type: :gcp, - platform_kubernetes_attributes: { - namespace: 'custom-namespace' - }, provider_gcp_attributes: { gcp_project_id: '!!!!!!!', zone: 'us-central1-a', @@ -73,55 +62,56 @@ describe Clusters::CreateService do end end - context 'when provider is user' do - context 'when correct params' do - let(:params) do - { - name: 'test-cluster', - platform_type: :kubernetes, - provider_type: :user, - platform_kubernetes_attributes: { - namespace: 'custom-namespace', - api_url: 'https://111.111.111.111', - token: 'token' - } - } - end + # TODO: This will be active in 10.3 + # context 'when provider is user' do + # context 'when correct params' do + # let(:params) do + # { + # name: 'test-cluster', + # platform_type: :kubernetes, + # provider_type: :user, + # platform_kubernetes_attributes: { + # namespace: 'custom-namespace', + # api_url: 'https://111.111.111.111', + # token: 'token' + # } + # } + # end - it 'creates a cluster object and performs a worker' do - expect(ClusterProvisionWorker).to receive(:perform_async) + # it 'creates a cluster object and performs a worker' do + # expect(ClusterProvisionWorker).to receive(:perform_async) - expect { result } - .to change { Clusters::Cluster.count }.by(1) - .and change { Clusters::Platforms::Kubernetes.count }.by(1) + # expect { result } + # .to change { Clusters::Cluster.count }.by(1) + # .and change { Clusters::Platforms::Kubernetes.count }.by(1) - expect(result.name).to eq('test-cluster') - expect(result.user).to eq(user) - expect(result.project).to eq(project) - expect(result.provider).to be_nil - expect(result.platform.namespace).to eq('custom-namespace') - end - end + # expect(result.name).to eq('test-cluster') + # expect(result.user).to eq(user) + # expect(result.project).to eq(project) + # expect(result.provider).to be_nil + # expect(result.platform.namespace).to eq('custom-namespace') + # end + # end - context 'when invalid params' do - let(:params) do - { - name: 'test-cluster', - platform_type: :kubernetes, - provider_type: :user, - platform_kubernetes_attributes: { - namespace: 'custom-namespace', - api_url: '!!!!!', - token: 'token' - } - } - end + # context 'when invalid params' do + # let(:params) do + # { + # name: 'test-cluster', + # platform_type: :kubernetes, + # provider_type: :user, + # platform_kubernetes_attributes: { + # namespace: 'custom-namespace', + # api_url: '!!!!!', + # token: 'token' + # } + # } + # end - it 'returns an error' do - # expect(ClusterProvisionWorker).not_to receive(:perform_async) - expect { result }.to change { Clusters::Cluster.count }.by(0) - expect(result.errors[:"platform_kubernetes.api_url"]).to be_present - end - end - end + # it 'returns an error' do + # # expect(ClusterProvisionWorker).not_to receive(:perform_async) + # expect { result }.to change { Clusters::Cluster.count }.by(0) + # expect(result.errors[:"platform_kubernetes.api_url"]).to be_present + # end + # end + # end end diff --git a/spec/services/clusters/gcp/finalize_creation_service_spec.rb b/spec/services/clusters/gcp/finalize_creation_service_spec.rb index ca7741f641b..0cf91307589 100644 --- a/spec/services/clusters/gcp/finalize_creation_service_spec.rb +++ b/spec/services/clusters/gcp/finalize_creation_service_spec.rb @@ -62,6 +62,7 @@ describe Clusters::Gcp::FinalizeCreationService do it 'has corresponded data' do described_class.new.execute(provider) + cluster.reload provider.reload platform.reload |