diff options
author | Tiger <twatson@gitlab.com> | 2019-05-31 12:44:59 -0500 |
---|---|---|
committer | Tiger <twatson@gitlab.com> | 2019-06-21 14:40:24 +1000 |
commit | 89a1594a244face6071ad5173ff86df13e446794 (patch) | |
tree | e146be3227f43193f791f23290e60cbd694b1902 /spec/models/project_services/kubernetes_service_spec.rb | |
parent | 9f07114618f957941953d0374fa43ab010a8ec9f (diff) | |
download | gitlab-ce-89a1594a244face6071ad5173ff86df13e446794.tar.gz |
Pass environment when finding deployment variables61156-pass-environment-when-generating-deployment-variables
This will enable looking up Kubernetes namespaces based on
the environment being deployed to, instead of using a single
namespace across all environments.
Diffstat (limited to 'spec/models/project_services/kubernetes_service_spec.rb')
-rw-r--r-- | spec/models/project_services/kubernetes_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb index 34ee1eafd5c..ed29d84fc02 100644 --- a/spec/models/project_services/kubernetes_service_spec.rb +++ b/spec/models/project_services/kubernetes_service_spec.rb @@ -257,7 +257,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do shared_examples 'setting variables' do it 'sets the variables' do - expect(subject.predefined_variables(project: project)).to include( + expect(subject.predefined_variables(environment: double)).to include( { key: 'KUBE_URL', value: 'https://kube.domain.com', public: true }, { key: 'KUBE_TOKEN', value: 'token', public: false, masked: true }, { key: 'KUBE_NAMESPACE', value: namespace, public: true }, @@ -284,7 +284,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do it_behaves_like 'setting variables' it 'sets the KUBE_NAMESPACE' do - kube_namespace = subject.predefined_variables(project: project).find { |h| h[:key] == 'KUBE_NAMESPACE' } + kube_namespace = subject.predefined_variables(environment: double).find { |h| h[:key] == 'KUBE_NAMESPACE' } expect(kube_namespace).not_to be_nil expect(kube_namespace[:value]).to match(/\A#{Gitlab::PathRegex::PATH_REGEX_STR}-\d+\z/) |