Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 44 deletions

diff --git a/qa/qa/page/project/import/github.rb b/qa/qa/page/project/import/github.rb
index dc683f7314b..83d9b160c8f 100644
--- a/qa/qa/page/project/import/github.rb
+++ b/qa/qa/page/project/import/github.rb
@@ -77,7 +77,9 @@ module QA
               reload: true,
               skip_finished_loading_check_on_refresh: true
             ) do
-              page.has_no_content?('Importing 1 repository')
+              # TODO: Refactor to explicitly wait for specific project import successful status
+              # This check can create false positive if main importing message appears with delay and check exits early
+              page.has_no_content?('Importing 1 repository', wait: 3)
             end
           end
 
diff --git a/qa/qa/page/project/infrastructure/kubernetes/show.rb b/qa/qa/page/project/infrastructure/kubernetes/show.rb
index e3b4f8fe4d9..62a04a53a2f 100644
--- a/qa/qa/page/project/infrastructure/kubernetes/show.rb
+++ b/qa/qa/page/project/infrastructure/kubernetes/show.rb
@@ -6,10 +6,6 @@ module QA
       module Infrastructure
         module Kubernetes
           class Show < Page::Base
-            view 'app/assets/javascripts/clusters/components/applications.vue' do
-              element :ingress_ip_address, 'id="ingress-endpoint"' # rubocop:disable QA/ElementWithPattern
-            end
-
             view 'app/assets/javascripts/clusters/forms/components/integration_form.vue' do
               element :integration_status_toggle, required: true
               element :base_domain_field, required: true
@@ -20,15 +16,6 @@ module QA
               element :details, required: true
             end
 
-            view 'app/views/clusters/clusters/_applications_tab.html.haml' do
-              element :applications, required: true
-            end
-
-            view 'app/assets/javascripts/clusters/components/application_row.vue' do
-              element :install_button
-              element :uninstall_button
-            end
-
             view 'app/views/clusters/clusters/_health.html.haml' do
               element :cluster_health_section
             end
@@ -42,36 +29,6 @@ module QA
               click_element :details
             end
 
-            def open_applications
-              has_element?(:applications, wait: 30)
-              click_element :applications
-            end
-
-            def install!(application_name)
-              within_element(application_name) do
-                has_element?(:install_button, application: application_name, wait: 30)
-                click_element :install_button
-              end
-            end
-
-            def await_installed(application_name)
-              within_element(application_name) do
-                has_element?(:uninstall_button, application: application_name, wait: 300, skip_finished_loading_check: true)
-              end
-            end
-
-            def has_application_installed?(application_name)
-              within_element(application_name) do
-                has_element?(:uninstall_button, application: application_name, wait: 300)
-              end
-            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
-              page.find('#ingress-endpoint', wait: 1200).value
-            end
-
             def set_domain(domain)
               fill_element :base_domain_field, domain
             end
diff --git a/qa/qa/resource/kubernetes_cluster/project_cluster.rb b/qa/qa/resource/kubernetes_cluster/project_cluster.rb
index b66a75d978b..ab8c8e93ed4 100644
--- a/qa/qa/resource/kubernetes_cluster/project_cluster.rb
+++ b/qa/qa/resource/kubernetes_cluster/project_cluster.rb
@@ -3,6 +3,8 @@
 module QA
   module Resource
     module KubernetesCluster
+      # TODO: This resource is currently broken, since one-click apps have been removed.
+      #       See https://gitlab.com/gitlab-org/gitlab/-/issues/333818
       class ProjectCluster < Base
         attr_writer :cluster,
                     :install_ingress, :install_prometheus, :install_runner, :domain
@@ -40,6 +42,8 @@ module QA
             # We must wait a few seconds for permissions to be set up correctly for new cluster
             sleep 25
 
+            # TODO: These steps do not work anymore, see https://gitlab.com/gitlab-org/gitlab/-/issues/333818
+
             # Open applications tab
             show.open_applications