diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-05-08 17:28:05 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-05-23 17:27:32 +0200 |
| commit | c769a3c258e84d7ba42265f02b763b753b07a05e (patch) | |
| tree | b97cc5ef20b16022d2e019abd5134220bee810b1 /spec/models | |
| parent | 8f6619885f95bdafaacddacda4c552f30e8a90a4 (diff) | |
| download | gitlab-ce-fix-kubernetes-namespace.tar.gz | |
Fix terminals support for Kubernetes servicefix-kubernetes-namespace
It was broken, because we introduced a default namespace, which was not used by terminal methods.
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/project_services/kubernetes_service_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb index c1c2f2a7219..cb35a5c81e5 100644 --- a/spec/models/project_services/kubernetes_service_spec.rb +++ b/spec/models/project_services/kubernetes_service_spec.rb @@ -13,7 +13,7 @@ describe KubernetesService, models: true, caching: true do let(:discovery_url) { service.api_url + '/api/v1' } let(:discovery_response) { { body: kube_discovery_body.to_json } } - let(:pods_url) { service.api_url + "/api/v1/namespaces/#{service.namespace}/pods" } + let(:pods_url) { service.api_url + "/api/v1/namespaces/#{service.actual_namespace}/pods" } let(:pods_response) { { body: kube_pods_body(kube_pod).to_json } } def stub_kubeclient_discover @@ -194,6 +194,7 @@ describe KubernetesService, models: true, caching: true do describe '#terminals' do let(:environment) { build(:environment, project: project, name: "env", slug: "env-000000") } + subject { service.terminals(environment) } context 'with invalid pods' do |