summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-05-08 17:28:05 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2017-05-08 17:28:05 +0200
commitc18878b5ec9d2b6bc56850cc68b824feb1609391 (patch)
tree6ba69b44ed85243309e881a73049e7d294571db0 /spec/models
parent11ff9fc6a9837cd5defa0325b5057a5a3d84634c (diff)
downloadgitlab-ce-fix-kubernetes-terminal.tar.gz
Fix terminals support for Kubernetes servicefix-kubernetes-terminal
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.rb3
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 e69eb0098dd..18817b94e41 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