diff options
| author | Peter Leitzen <pleitzen@gitlab.com> | 2019-06-25 18:03:44 +0200 |
|---|---|---|
| committer | Peter Leitzen <pleitzen@gitlab.com> | 2019-07-02 09:30:28 +0200 |
| commit | eeed581398690b925c41d8c94652a326a2da55bc (patch) | |
| tree | 6e2a733bc9ee9228b7c9311a3fe1b8d360c4ec5e | |
| parent | 02ad0c2f6aedfe5053a79b027cc2882115c1cad5 (diff) | |
| download | gitlab-ce-pl-prometheus-uninstall-button-qa.tar.gz | |
Wait for 'Uninstall' when installing Prometheuspl-prometheus-uninstall-button-qa
Prometheus is uninstallable so waiting won't see 'Install' at all.
We'll see 'Uninstall' instead.
| -rw-r--r-- | qa/qa/page/project/operations/kubernetes/show.rb | 8 | ||||
| -rw-r--r-- | qa/qa/resource/kubernetes_cluster.rb | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/qa/qa/page/project/operations/kubernetes/show.rb b/qa/qa/page/project/operations/kubernetes/show.rb index c81e13e9b91..4f625c5f0f0 100644 --- a/qa/qa/page/project/operations/kubernetes/show.rb +++ b/qa/qa/page/project/operations/kubernetes/show.rb @@ -28,12 +28,16 @@ module QA end end - def await_installed(application_name) + def await_installed(application_name, button_text: 'Installed') within(".js-cluster-application-row-#{application_name}") do - page.has_text?('Installed', wait: 300) + page.has_text?(button_text, wait: 300) end end + def await_uninstallable(application_name) + await_installed(application_name, button_text: 'Uninstall') + end + def ingress_ip # We need to wait longer since it can take some time before the # ip address is assigned for the ingress controller diff --git a/qa/qa/resource/kubernetes_cluster.rb b/qa/qa/resource/kubernetes_cluster.rb index 27ab7b60211..1dd93dd5b88 100644 --- a/qa/qa/resource/kubernetes_cluster.rb +++ b/qa/qa/resource/kubernetes_cluster.rb @@ -47,7 +47,7 @@ module QA page.install!(:runner) if @install_runner page.await_installed(:ingress) if @install_ingress - page.await_installed(:prometheus) if @install_prometheus + page.await_uninstallable(:prometheus) if @install_prometheus page.await_installed(:runner) if @install_runner if @install_ingress |