diff options
author | Stan Hu <stanhu@gmail.com> | 2019-08-02 22:45:44 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-08-02 22:45:44 +0300 |
commit | 57e00e191dad442ba74940c6a97ba4ae2bc60d8b (patch) | |
tree | 83f33a5c6f83da11cd34c8347be97ff25671d80e /spec | |
parent | e14265d50d80e96db694f66d6ea3a12b1fdcf943 (diff) | |
parent | 08188285cbfe2f0791d8cb913b7d19b216ff1c85 (diff) |
Merge branch '65339-follow-up-from-resolve-kubernetes-applications-uninstall-knative' into 'master'
All Kubectl command should return array by default
See merge request gitlab-org/gitlab-ce!31305
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/clusters/applications/knative_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/clusters/applications/prometheus_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/clusters/applications/knative_spec.rb b/spec/models/clusters/applications/knative_spec.rb index 342ed907854..334f10526cb 100644 --- a/spec/models/clusters/applications/knative_spec.rb +++ b/spec/models/clusters/applications/knative_spec.rb @@ -91,7 +91,7 @@ describe Clusters::Applications::Knative do end it 'does not install metrics for prometheus' do - expect(subject.postinstall).to be_nil + expect(subject.postinstall).to be_empty end context 'with prometheus installed' do @@ -101,7 +101,7 @@ describe Clusters::Applications::Knative do subject { knative.install_command } it 'installs metrics' do - expect(subject.postinstall).not_to be_nil + expect(subject.postinstall).not_to be_empty expect(subject.postinstall.length).to be(1) expect(subject.postinstall[0]).to eql("kubectl apply -f #{Clusters::Applications::Knative::METRICS_CONFIG}") end diff --git a/spec/models/clusters/applications/prometheus_spec.rb b/spec/models/clusters/applications/prometheus_spec.rb index 26267c64112..d9f31c46f59 100644 --- a/spec/models/clusters/applications/prometheus_spec.rb +++ b/spec/models/clusters/applications/prometheus_spec.rb @@ -142,7 +142,7 @@ describe Clusters::Applications::Prometheus do end it 'does not install knative metrics' do - expect(subject.postinstall).to be_nil + expect(subject.postinstall).to be_empty end context 'with knative installed' do |