diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-01 16:18:52 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-01 16:18:52 +0300 |
| commit | 5f742eb95a0080343167469ccabfeccd3630007d (patch) | |
| tree | 545b524f3ce17ce154238e87b393bef987a001df /spec/services | |
| parent | 71384c590cda562ed0ccf62daee66cd69ea82f4f (diff) | |
| parent | bec319f894209044f31e3befac84238b6cad6eed (diff) | |
Merge branch 'timeouted' into 'master'
correct error message on helm tiller installation timeout
See merge request gitlab-org/gitlab-ce!20683
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/clusters/applications/check_installation_progress_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 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 6894c1797b0..986f11410fd 100644 --- a/spec/services/clusters/applications/check_installation_progress_service_spec.rb +++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb @@ -43,7 +43,7 @@ describe Clusters::Applications::CheckInstallationProgressService do service.execute expect(application).to be_errored - expect(application.status_reason).to match(/\btimeouted\b/) + expect(application.status_reason).to match(/\btimed out\b/) end end end |