diff options
author | Bob Van Landuyt <bob@gitlab.com> | 2018-10-01 19:36:26 +0300 |
---|---|---|
committer | Bob Van Landuyt <bob@gitlab.com> | 2018-10-01 19:36:26 +0300 |
commit | b8cf41bc166e8b625852516bfbf43a03e56cd770 (patch) | |
tree | dbc92a6fc4023a0c6685219dbff1955e2f08322d /spec | |
parent | a04c4ae3befbd366e53b2dc6ae6ab92e53eba4c5 (diff) | |
parent | 6f0b7a39eba2b7b127060c80aeac28ebed1ad6a1 (diff) |
Merge branch 'security-gcp-token-exposed-by-kubernetes' into 'master'
[master] - Do not persist errors from Kubernetes calls
See merge request gitlab/gitlabhq!2506
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/clusters/applications/check_installation_progress_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/clusters/applications/install_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/clusters/applications/check_installation_progress_service_spec.rb b/spec/services/clusters/applications/check_installation_progress_service_spec.rb index 986f11410fd..1a565bb734d 100644 --- a/spec/services/clusters/applications/check_installation_progress_service_spec.rb +++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb @@ -82,7 +82,7 @@ describe Clusters::Applications::CheckInstallationProgressService do service.execute expect(application).to be_errored - expect(application.status_reason).to eq(errors) + expect(application.status_reason).to eq("Installation failed") end end diff --git a/spec/services/clusters/applications/install_service_spec.rb b/spec/services/clusters/applications/install_service_spec.rb index a744ec30b65..4bd19f5bd79 100644 --- a/spec/services/clusters/applications/install_service_spec.rb +++ b/spec/services/clusters/applications/install_service_spec.rb @@ -42,7 +42,7 @@ describe Clusters::Applications::InstallService do service.execute expect(application).to be_errored - expect(application.status_reason).to match(/kubernetes error:/i) + expect(application.status_reason).to match('Kubernetes error.') end end |