diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-14 15:34:10 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-14 15:34:10 +0000 |
commit | 5468bf7e0b2c6bf39f5a9b43b5b3864e7e57556d (patch) | |
tree | 384240ebe7ac24f6677d13aff08ee2d446ca996e /spec/lib | |
parent | 64e85fdaffcd03ef52ff74953b1a4e0caf5a23e8 (diff) | |
parent | fc6e3515a6a80788053ea943cb43eae2cadda21f (diff) | |
download | gitlab-ce-5468bf7e0b2c6bf39f5a9b43b5b3864e7e57556d.tar.gz |
Merge branch '2525-backport-kubernetes-service-changes' into 'master'
Backport EE changes to the Kubernetes service
Closes gitlab-ee#2525
See merge request !12139
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/kubernetes_spec.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/lib/gitlab/kubernetes_spec.rb b/spec/lib/gitlab/kubernetes_spec.rb index 91f9d06b85a..e8c599a95ee 100644 --- a/spec/lib/gitlab/kubernetes_spec.rb +++ b/spec/lib/gitlab/kubernetes_spec.rb @@ -1,6 +1,7 @@ require 'spec_helper' describe Gitlab::Kubernetes do + include KubernetesHelpers include described_class describe '#container_exec_url' do @@ -36,4 +37,13 @@ describe Gitlab::Kubernetes do it { expect(result.query).to match(/\Acontainer=container\+1&/) } end end + + describe '#filter_by_label' do + it 'returns matching labels' do + matching_items = [kube_pod(app: 'foo')] + items = matching_items + [kube_pod] + + expect(filter_by_label(items, app: 'foo')).to eq(matching_items) + end + end end |