Merge branch 'pl-uninstall-button-qa' into 'master'

Check for "Uninstall" button reducing friction

See merge request gitlab-org/gitlab-ce!30713

2 files changed, 3 insertions, 7 deletions

diff --git a/qa/qa/page/project/operations/kubernetes/show.rb b/qa/qa/page/project/operations/kubernetes/show.rb
index 4f625c5f0f0..eb30e0ea02a 100644
--- a/qa/qa/page/project/operations/kubernetes/show.rb
+++ b/qa/qa/page/project/operations/kubernetes/show.rb
@@ -28,16 +28,12 @@ module QA
               end
             end
 
-            def await_installed(application_name, button_text: 'Installed')
+            def await_installed(application_name)
               within(".js-cluster-application-row-#{application_name}") do
-                page.has_text?(button_text, wait: 300)
+                page.has_text?(/Installed|Uninstall/, 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 1dd93dd5b88..27ab7b60211 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_uninstallable(:prometheus) if @install_prometheus
+            page.await_installed(:prometheus) if @install_prometheus
             page.await_installed(:runner) if @install_runner
 
             if @install_ingress